Cleanup of comments and ifdef's
Merge branch 'master' of https://github.com/sirsnork/CellularRemoteControl