Use package.el in more places. Some new modes..
Merge remote-tracking branch 'github/master'

Conflicts:
	init.el