dentsync
Don't use -f with readlink
Include ~/.git-prompt.sh into .bashrc
Merge branch 'master' of github.com:steshaw/shelly

Conflicts:
	dotfiles/.bashrc