Update stuff for work computer
Update a few things, add alias for git stuff
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
Merge remote-tracking branch 'origin' into work

Conflicts:
	vim/.vimrc
Minor update
Add .gvimrc with minor changes from .vimrc
Update to better fit some things...
From zsh-lovers
Update theme
Rename theme file
Update theme, bug fix?
More minor updates
Minor last one