merge
align-ws
Merge branch 'master' of github.com:GooseYArd/.emacs.d

Conflicts:
	init.el
Merge branch 'master' of github.com:GooseYArd/.emacs.d
whitespace-cleanup-on-save