Added filetype vimfile for html.
Removed molokai theme.
Removed empty line in init.el (emacs).
Merge branch 'master' of github.com:Gluestick/dotfiles