Fix bug affecting article subdirectories with non-default sources.

See https://github.com/middleman/middleman-blog/issues/137
Merge branch 'subdir-fix'

* subdir-fix:
  Fix bug affecting article subdirectories with non-default sources.