general view for dealing with our rest api calls
Merge branch 'master' into load-custom-templates

Conflicts:
	faucet/views.py