Updated Git ignores and modules.
Merge branch 'develop'

* develop:
  Updated Git ignores and modules.