last update from fusionbox
Merge branch 'master' of github.com:aaronmerriam/dotfiles