history stuff
Merge branch 'master' of github.com:scottmo/dotfiles

Merging from BH
Merge branch 'master' of github.com:scottmo/dotfiles

Merge
added export keyword just in case