Fixed a few things that shouldn't have been in the last build. A git
hard reset didn't reset HEAD.