Improved gitignore
Merge branch 'master' into unimelb-old