updated and reorganised init.el
Merge branch 'master' of github.com:osheadavid7/config_files

Conflicts:
	init.el