match indexes and column options too when comparing annotation headers

lib/annotate/annotate_models.rb

@@ -127,7 +127,7 @@ module AnnotateModels
         old_header = old_content.match(header_pattern).to_s
         new_header = info_block.match(header_pattern).to_s
 
-        column_pattern = /^#[\t ]+\w+[\t ]+:\w+/
+        column_pattern = /^#[\t ]+\w+[\t ]+(?:(?::\w+)|(?:\([\w,]+\)(?:[\t ]+[\w ]+)?))(?:[\t ]+[\w, ]+)?$/
         old_columns = old_header && old_header.scan(column_pattern).sort
         new_columns = new_header && new_header.scan(column_pattern).sort