Commit 3cf11eef17d8359c032844de945da6e983572ecc

Russell Belfer 2014-01-28T11:47:33

Misc cleanups