Formatting cleanup of package.xml
Clean up CMake.
Merge pull request #1 from trainman419/cleanup

Cleanup