Minor fixes.
Merge branch 'master' of github.com:h3rald/stash

Conflicts:
	.bashrc