Merge branch 'release/2.6.2' into develop

* release/2.6.2:
  v2.6.2
Add an option to exclude timestamp in routes, #136
Add guard-rspec
Fix the conversion from file path to class name which should fix #125 and #141
Make --timestamp optional by default
Adjusting column match regexp to match markdown template
Merge pull request #171 from swistak/develop

Adjusting column match regexp to match markdown template
Merge branch 'master' into develop
Merge branch 'hotfix/issue-#175' into develop
Merge branch 'master' into develop
--sort option puts ID at top and timestamps at bottom.
proper identification of columns in sort
Update annotate.gemspec
Merge pull request #1 from AstuteAlpaca/develop

merge develop to master