First Run of hypervisor support. Need to make template work on is_staff attribute
Update router for new collection (Only if used by staff user)
Hypervisor support now works exclusively for staff users. Non staff users will see no change
Change to spacing
Feature Complete. Includes a script for 'fixing' existing PMs and MachineRequests. 'Normal Process' has the owner updated on process_machine_request step.
Merge branch 'ATMO-300' into herja
Bad type-cast on is_staff
Unrelated commit - Add rebooting (Soft Reboot) to the list
Backend API supports UpVote and DownVote through new API endpoint /machine/##/vote/ GET shows previous vote, POST {'vote':['up/down/[empty/anything]'] to UpVote,DownVote, or ClearVote. New core model ApplicationScore with corresponding migration and api serializers
ATMO-350 add zsh support.
	modified:   init_files/v2/atmo_init_full.py
	modified:   service/deploy.py
PEP8 Compliance.
	modified:   core/tasks/instance.py
Merge branch 'gunnr' into herja
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja
Merge branch 'herja' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja

Conflicts:
	resources/js/cf2/views/sidebar/instance_list_item.js
Fixed add_fixed_ip task, which was failing to report non-standard exceptions
Add andre to the access list
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Optional Auth + Multi-provider for /application

/api/v1/application is accessible with or without an API token
* if authenticated, the endpoint will include all private images
  that are visible for that user.
* Does not hit OpenStack, relies only on membership information
Forgot to add /api/applciation file