Commit changes for merge
Make python-mode less sucky
Merge branch 'master' of github.com:phmc/dotfiles

Conflicts:
	.gitmodules