First swathe of CanCan authorizations
Merge branch 'master' into authorization

Conflicts:
	app/controllers/surveyor_controller.rb
Merge branch 'master' into authorization

Conflicts:
	app/controllers/surveyor_controller.rb
Merge branch 'master' into authorization
Merge pull request #108 from theodi/authorization

Authorization