adding stuff
fixed up the submodules
added powerline back in
prepping for merge
Merge branch 'master' into whatever

Conflicts:
	.gitmodules
	bashrc
	bin/md
	to-be-installed
	vim/ftplugin/javascript.vim