Set up db to import from data.json
Merge branch 'master' of https://github.com/nickpope/commpute
Stuff!
Merge branch 'master' of https://github.com/nickpope/commpute

Conflicts:
	commpute.py