Merge branch 'master' of git://github.com/j4ckofalltrades/dotfiles

Conflicts:
	README.md
Merge branch 'master' of git://github.com/j4ckofalltrades/dotfiles

Conflicts:
	README.md