Merge from davesantos/tumblr-boilerplate