making changes left and right
Merge branch 'master' of github.com:joelash/dotfiles