Fixing paginate_path on windows
Further clarify what paginate_path should do in the case of directories in the path
Install jekyll-import with the --pre flag for now.
Merge pull request #1063 from Kelsin/fixing-paginate_path-for-windows

Fixing pagination on windows
Convertible now reads an external metadata file (If available)
The metadata in the file itself is still read, and takes precedence.
Added Cucumber feature for external metadata.
Made it so files with external metadata are treated as Pages
Also, .metadata files are now filtered out of the outputted site.
Documentation now mentions external .metadata files
(Hopefully) fixed site.read_directories
Should pass test suite on Travis now. Or at least fail less.
Fixed typos in Cucumber features...
Refactor test in site.rb to be more readable
Fix bug with metadata merging.

If a Convertible instance already had metadata, the metadata on the file
itself wasn't being merged properly, because Array.merge was used
instead of Array.merge!
Merge branch 'external-metadata' of http://github.com/sequitur/jekyll into external-metadata

Conflicts:
	lib/jekyll/convertible.rb
	lib/jekyll/site.rb