fixing init file
Merge branch 'master' of github.com:btoconnor/.emacs.d

Conflicts:
	init.el