Initial stab
Merge remote-tracking branch 'dotfiles/master'

Conflicts:
	README.md