PEP8 Compliance.
	modified:   api/notification.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
PEP8 Compliance
	modified:   api/urls.py
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