Update vnc-config.sh sha1sum.
	modified:   init_files/v2/atmo_init_full.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge conflict resolved in resources file
PEP8 Compliance.
	modified:   core/models/provider.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Fix project delete
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar