Incorporated changes to gitignore from develop.