Updated gitignore
Merge latest work from dev branch