minor changes
Merge branch 'master' of https://github.com/nirster/dotfiles

Conflicts:
	README.md