Renamed TestsApi folder to tests and minor fixes
Change core_uri/url_prefix stuff
Merge branch 'chaos.io.tests' into chaos.io
Merge branch 'chaos.io' into chaos.io.js

Conflicts:
	src/mist/io/static/js/app/controllers/monitoring.js
Merge branch 'chaos.io.tmp' into chaos.io.js
add ec2-user and ubuntu as last options when ssh connection fails
return list_machines when performing machine_action

so that the stupid js frontend doesn't break.