Merge branch 'release/2.6.0'
Pump version to 2.6.1 which fixes #22
Merge branch 'release/2.6.1'
FIX #157
merge from origin gemspec
migrate.rake should live in lib/tasks
Fixed gemspec files attribute
Merge pull request #1 from dointeractive/develop

Fixed gemspec files attribute
use general file resolution for test files as well

the special-purpose file resolution method for test/spec files was failing
with namespaced test files (ex. User model attributes would annotate both
test/unit/user_test.rb as well as test/unit/foo/user_test.rb, instead of
only the former)
switch deprecated "mock" for "double" in annotate specs

changing to get rid of deprecation warnings
Merge pull request #164 from ivanyv/develop

migrate.rake should live in lib/tasks
Merge pull request #166 from jonoterc/namespacefix

fix overwriting of namespaced model test annotations with non-namespaced model annotations
Merge pull request #165 from swistak/develop

Replacing old block with new one.
Merge pull request #158 from orbanbotond/develop

Fix for #157
Add .travis.yml
Change email address
Revert "Replacing old block with new one."

This reverts commit b11928ed0d787e36949520345edd9e80007ec767.
Temporarily ignore integration tests
Retain existing position unless :force is passed
Add known changes for 2.6.2.