Cleanup
Merge branch 'master' of https://github.com/CenterForOpenScience/osf-fileviewer

Conflicts:
	app/FileView.py
	app/templates/index.html