Changed initialization order
Merge branch 'master' of github.com:chanika/dotfiles

Conflicts:
	emacs