Some useful tools that I'm pulling from another project
Added api.py and moved models to TokenedModels
Merge branch 'master' of github.com:Sticksman/inline-writer

Conflicts:
	python/artillery/views.py