Fix up a load of badly written code
Merge branch 'develop' of github.com:dotphiles/dotsync into develop