Modified init of emacs
Merge branch 'master' of https://github.com/jcan37/dotfiles
Modified .bashrc