additional changes
Merge branch 'mass-cleanup' of https://github.com/nusolar/sc6-pic32-code into mass-cleanup