Fix jsonify bug
Changes ServerName to localhost
Merge branch 'master' of https://github.com/annegentle/watertruck

Conflicts:
	deployment/config/httpd.conf