Added ignore for metadata files
Updated gitignore and removed unecessary files
Removed more unecessary files and updated git ignore
Merged with master