Style stuff and fixes
Merge branch 'master' of https://github.com/Not-Another-Acronym/Incursus-Labs