Cleaned up submodules, readded gitignore