Cleanup on CLI app, sync PHPCS

So this should clean up some unneeded lines in the CLI app and get things up to PHPCS standard again.  Also syncs up the PHPCS remote.  Don't think it should collide too badly with #217 (which I totally forgot about).