updates
Merge branch 'master' of github.com:darcyparker/my_dotfiles