have salt stack files use two spaces only
update vimrc
use osx keychain helper
colored diff
color everywhere!