Initial import from app-template.
Merge branch 'master' of github.com:dannydb/tumblr-blog