Reorganizaation, post bspwm-install changes
Merge branch 'master' of https://github.com/alexjacks92/dotfiles