Upgrade bundle for Rails 4
Merge branch 'master' of https://github.com/SixArm/sixarm_bash_etc_files