Josh clean

went through and cleaned out all the .pyc and .idea/ stuff, added the start of testing