Added roslint checks to CMakeLists
Manual merge of origin
Format changes (no code changes)
Reverted some commented out targets.  Added roslint options/justifications