Prepare for more development
Update dependancies to allow using with a rails 4 app (rails 3 is still tested against by travis)
Remove lockfiles from gemfiles
Attempt to fix "cannot load such file -- rspec/core/rake_task" in travis
Fix gem version for activemodel.
Prepare for release
Merge branch 'staging'