Updated init.el
Merge branch 'master' of https://github.com/ragesalmon/dotfiles
Updated gitignore
Removed a bunch of junk files