WIP
Merge branch 'wip' of github.com:jmontineri/cabot into jmontineri-instances

Conflicts:
	app/cabotapp/migrations/0004_auto.py
	app/cabotapp/views.py
Create pingcheck in the view