Commit some changes.
Resolving conflicts.
Merge branch 'master' of github.com:swainn/django-tethys_gizmos