Merge branch 'master' of https://github.com/ApiBootstraper/Rails-server into rails3
bundle update + upgrade versionist routes
Update .rvmrc-dist