Revert d654a2a..bfa3e2e

This rolls back to commit d654a2a6bf720272b9389a04f91056334c2498e2.
Merge branch 'master' of https://github.com/mastersplinter/opal

Conflicts:
	opal/models/__init__.py
	opal/urls.py
	opal/views.py