Some changes to shortcuts.
Merge branch 'master' of https://github.com/mattmorton/oh-my-zsh

Conflicts:
	custom/dropboxshorcuts.zsh
	custom/projshortcuts.zsh