''
Merge branch 'master' of https://github.com/ragesalmon/dotfiles
Updated init.el