Merge branch 'hotfix/update_to_work_with_rails4'
Merge branch 'release/update'
Version bump to 1.0.0
Regenerate gemspec for version 1.0.0
fix tests
Merge branch 'hotfix/tests' into develop