Merge branch 'master' of https://github.com/ContinuumIO/memex-viewer
Merge branch 'cleanup1'

Conflicts:
	app/__init__.py
	app/plotting.py