Add lalopmak-vimp
Default to lalopmak/colemak
Merge branch 'master' of github.com:timwraight/emacs.d

Conflicts:
	custom/el-get/setup/init-auto-complete.el
	packages.el