Playing in sandbox
Merge branch 'master' of https://github.com/jjwyse/gaeblog
Pulling in changes from Mac