updated
Merge branch 'develop' of github.com:JoshuaEstes/dotfiles into develop

* 'develop' of github.com:JoshuaEstes/dotfiles:
  meh
  meh