Change to .gitignore
Several small cosmetic changes
Merge branch 'develop'