Remove abc-mode to make space as a submodule
Remove web-mode
Start using git submodules instead of package.el
Merge branch 'master' of https://github.com/PatrickRose/.emacs.d

Conflicts:
	abc-mode
	init.el
	web-mode