Merge branch 'master' of https://github.com/farvig/wp-boilerplate.git