Incorporated changes to gitignore from develop.
Merge branch 'docs' into develop