More changes
Cleaned up
Merge branch 'master' of https://github.com/josephwinston/dotfiles