Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'atmo-299'
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	api/occupancy.py
Merge branch 'atmo-291'
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'atmo-302'
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
ATMO-302 Fix account-management endpoint.

* Update username route to be less strict.
* Fix import statements so api/accounts.py actually works.

	modified:   api/accounts.py
	modified:   atmosphere/urls.py
Merge branch 'atmo-302'
ATMO-315 Remove provenance dir since it's misleading.
	deleted:    prov/__init__.py
ATMO-288 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
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
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr'
Update LICENSE.txt copyright year.
Update LICENSE.txt copyright year.