Merge branch 'master' of github.com:whatevsz/dotfiles

Conflicts:
	README.rst
Merge branch 'master' of github.com:whatevsz/dotfiles

Conflicts:
	README.rst