cleaned up git stuff (wasn't merged with sjs_working branch)