Merge pull request #1 from ZomgPonies/master

Update
Ninja / CentComm changes
Merge pull request #119 from SamCroswell/master

CentComm changes