latest from iMac
Merge branch 'master' of github.com:aufflick/emacs.d

Conflicts:
	aufflick-el-get.el
	aufflick-keymaps.el
	aufflick-ui.el
	my_dot_emacs
slimmed down config and using new el-get init files