Misc cleanup

Misc cleanup of local repo.

Signed-off-by: Jonathan Williamson <jonathan@cgcookie.com>