Update
Update zipcar aliases
Merge branch 'master' of github.com:durrantm/setups-and-dotfiles

Conflicts:
	.bash_aliases