Cleaned up some things and updated .gitignore