Switched to elpa.
Merge branch 'master' of github.com:red1ynx/emacs-configs
Fixed automatic merge.