More API
Merge branch 'master' of https://github.com/gumptionthomas/mc-coal

Conflicts:
	models.py