little fixes
Merge branch 'master' into windows

Conflicts:
	dotfiles/.bash_prompt