Cleanup and fix the ajax stuff
Merge branch 'master' into excerpts