Merge branch 'master' of github.com:phatblat/dotfiles

Conflicts:
	.dotfiles/bash/options.sh
	.zshrc
Yosemite compatibility
Fix merge error in options.sh
Update mergetool to discard backups
Fully hook zsh into dotfiles

.zshrc and .bashrc are now just symlinks
*.zsh gets sourced by zsh, *.sh by bash
Cleanup
Add alias-git.zsh
Ignore .DS_Store
Merged .gitignore add
Add aliases for git push/pull
Add tracked, untracked, push, pull, reset, stash and snapshot aliases
Add godark/golight aliases for Yosemite themes
Add git tag and log aliases