Updating init.el.
Merge branch 'master' of github.com:blischalk/dotfiles

Conflicts: