Moved stuff
Merge branch 'master' of github.com:kerbymart/appengine-catfish