Added slate config, changed .vimrc to work (better) for mac, and updated .gitconfig
Fixing merge?