Update dotfiles
update settings
Delete crufty stuff
Merge branch 'master' of github.com:zackrw/dotfiles