Removed tabs from logrotate
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'

submitting port of enabling auto updates for vnc server 5.2.0
Bad varname
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
PEP8 Compliance.
	modified:   service/allocation.py
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Minor bug fixes
	modified:   import_users_from_openstack.py