Updates
Merge branch 'master' of github.com:jpl/dotfiles
Update rails plugin