Merge commit 'mojombo/master'
Fixing permalink support
Add a working Mephisto / MySQL converter
created a converter for textpattern, and a simple usage guide
Created a test to expose a bug with markdown and pygments

The error seems to stem from how markdown expects certain blocks to begin and end with a newline.
Fixed an issue with pygments, markdown, and newlines.
Allowing .htaccess files to be copied over into the generated site, to help those migrating from other blogging systems.  Used an array inlcusion check vs. == in case there are other special cases like this, subtly thumbing my nose at YNGNI I guess.
Added option to not put file date in permalink URL
Ampersands need to be escaped.
entitify ampersands to prevent malformed unescaping output
add minimal tests for xml_escape filter
update history
Merge commit '32a9b6b8dd330e826'
update history
Merge commit '5cfa956448f00730'
update history
Merge commit 'a0da1249a31faa704'
update history
Merge commit '6980948528f'
update history