PEP8 Compliance.
	modified:   api/notification.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
PEP8 Compliance
	modified:   api/urls.py
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Bad varname
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Remove 'email_hash' from profile
BUGFIX: request_user in filter list.. Prepare for a more robust 'start_machine_imaging' task-starter
There was no deploy happening if the optional root password was left out.
Remove commented out call to non-existent method. Remove second packaging update call on non-centos machines.
	modified:   init_files/v2/atmo_init_full.py
Remove spammy logger line.
	modified:   authentication/token.py
Fix order of parameters for destroy_instance.
	modified:   service/task.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar

Conflicts:
	init_files/v2/atmo_init_full.py
	init_files/v2/vnc-config.sh
Script doesn't import users...

Fixed a number of bugs and made it PEP8 compliant.

	modified:   scripts/import_users_from_ldap.py
Fix typo. is_atmo_user not atmo_user.
	modified:   scripts/import_users_from_ldap.py
dry_run argument is un-defined and raises an exception.

Implement functionality around dry_run.
	modified:   scripts/import_users_from_ldap.py
Updated requirements
Changes to application, search and history apis.

Default to paginated json instead of a json list, use the list size as the
page size in that situation.

Allow for paginated queries with no results.

Rename machine_search to search.

	modified:   api/application.py
	modified:   api/instance.py
	modified:   api/machine.py
	renamed:    service/machine_search.py -> service/search.py
PEP8 Compliance.
	modified:   core/query.py
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar