Update a few things, add alias for git stuff
Update some more things
Minor typo
Merge branch 'work' of github.com:JoshAshby/dots into work

Conflicts:
	zsh/alias.zsh
	zsh/philips.zsh-theme