Merge branch 'master' of github.com:jasperkennis/fontanel-tumblr-importer