ATMO-287 Add Andre's work. Shouldn't be moved to Gunnr - Still incomplete.

* Upstart script was showing up as changed.

	modified:   extras/init.d/ubuntu.celeryd
	modified:   init_files/v2/vnc-config.sh
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere