Another Clean up

Here is attempt two to clean up and set the gitignore for good.