making it work for Dave AGAIN - json vs jsonp -- why couldn't you tell me the first time
Merge branch 'master' of https://github.com/ddc0660/assassin