CHanged some sutff
Merge branch 'master' of https://github.com/pybae/dotfiles

Conflicts:
	emacs/.emacs.d/config/init-evil.el