working on database migration stuff
Merge branch 'master' of https://github.com/thequbit/bits

Conflicts:
	bits-serve/bitsserve/utils.py