Fixed issues with auto-complete
various tweaks to init.el
Merge commit '6c15ac0'

Conflicts:
	init.el