Use some waterbutler variables
Merge branch 'feature/water-butler' of https://github.com/CenterForOpenScience/osf.io into feature/water-butler

Conflicts:
	website/static/js/fangorn.js
addon -> provider
Fix delete requests