Updating to be rails 4.0 comptatible.
Bumped version
Merge branch 'master' into rails_4

Conflicts:
	Gemfile.lock
	test/base_test.rb
fix merge conflicts and get tests passing
fix Railtie typo
Merge pull request #16 from backupify/rails_4

Rails 4