Rename some things
Merge branch 'master' of github:databrary/play