Better comments for CommandlineModule
Removed extraneous files from using a weird git merge tool
Merge remote-tracking branch 'origin/api_build' into api_build