Updated cap and configs
Added capistrano bundler gem
Merge branch 'master' into capistrano
Remove env-specific configs