Stuff
Merge branch 'master' of github.com:elabs/dotfiles

Conflicts:
	.gitmodules
	link/bash/config