ACTUALLY fix lazy copy-pasting
Merge branch 'dev'
Merge branch 'master' of github.com:grantgarcia/qdbapp into dev

Conflicts:
	fabfile.py
Merge branch 'dev'