updated aliases; added jsx to js-mode in emacs
use ruby-mode for jbuilder
Merge branch 'master' of https://github.com/dicksonlabs/dotfiles