Updated models and BUGFIX Allocation creep

Fixed a bug that occurred when instances lasted longer than the delta time
Change ApplicationThreshold to "OneToOneField" To establish uniqueness and be
more django-friendly.
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Removed. Replacement:scripts/import_users_from_ldap.py

Presumably this was re-added on accident. See scripts/import_users_from_ldap.py
 to use the newest version of this script.
ATMO-160: Added users real name to email feedback
Removed old import line
Fix problem where status was required.
	modified:   scripts/resources.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Merge branch 'abyssinian-nightjar'