git aliases stripped
git-chiefs config removed
git autocrlf and whitespace config
some handy zsh aliases
don't empty trash securely by default
Merge remote-tracking branch 'michaelcontento/master'

Conflicts:
	.gitconfig
	.osx
Merge branch 'master' of github.com:cylonbrain/dotfiles