Sorry for the trigger happy commits, but with each one I'm
actaully trying to fix some post-commit script magic :)