various fixes
Merge branch 'master' of github.com:vineetgopal/minimaestro

Conflicts:
	minimaestro/views.py
Final fixes