small changes for compatibility with core's latest changes
change shell.py so that it doesn't try to use ssh-agent or look for ssh keys in local ~/.ssh
change monitoring.js to use json instead of jsonp when fetching stats
fix typo/error in User
and fix issue with missing slash in db.yaml absolute path
Merge branch 'chaos.io' into chaos.io.js

Conflicts:
	src/mist/io/static/js/app/controllers/monitoring.js