Misc tidyup
Merge branch 'master' of https://github.com/Ipsis/Mining-And-Construction-Kit