some changes i've made recently.
Merge branch 'master' of github.com:blovett/dotfiles