Reformatting, tidying, forcing all AJAX calls to use JSON
Merge remote-tracking branch 'origin/master'