Changed 'when not' into 'unless'
Merge branch 'master' of github.com:zshamrock/emacs.d
Moved hooks into separate function, and call it after everything is initialized