pep8 and clean up app_manager.models
Merge branch 'master' into cleanup-app-models

Conflicts:
	corehq/apps/app_manager/models.py
Merge pull request #1218 from dimagi/cleanup-app-models

pep8 and clean up app_manager.models