Merge branch 'dev' of bitbucket.org:twinbrother/wp-blankslate-theme into dev

* 'dev' of bitbucket.org:twinbrother/wp-blankslate-theme:
  fix merge conflict
Merge branch 'dev'

* dev: