Random fixes... I'm terrible at this branching thing.
removed tmp directory from git