getting ready for refactor
Merge branch 'master' of github.com:ninetwentyfour/dotfiles into merge_upstream