Clean up short_pwd without hardcoded username, also for macs
Added some function comments
Merge branch 'master' of github.com:omnicolor/dotfiles

Conflicts:
	bash_prompt