Merge branch 'develop' of github.com:druu/dot-files into develop

wtf is going on ffs....