Tap ordering
Tap ordering
Ok, tap ordering for real this time
Merge branch 'master' of nickpegg.com:~/git/home

Conflicts:
	brewhouse/views.py