fold services
remove bogus module
remove nonsense timings (e.g. on `[runtime] --version`)
clean up some sh.cmd options
re-prettify a few things
Merge pull request #328 from travis-ci/sf-prettify

Cleanup after sf-sexp-2 diff cleaning