Merged some changes that were lost because of an iffy symlink
Merge branch 'master' of https://github.com/Bonemind/configs