Merged upstream
Merge branch 'master' of git://github.com/jonbullock/JBake
Merge branch 'master' of git://github.com/jonbullock/JBake
Added character encoding to configuration which is used for rendering.
Added functionality render sitemap.xml

Signed-off-by: Ilja <ilja@ilja-ThinkPad-W520.ctldomain.ad.local>
Merged in #54.
Reverted change in convention re: posts & pages for time being. Also set
Asciidoctor to UNSAFE mode in code.
Merged #56.
Switched to Pegdown Markdown processor from MarkdownJ
Allow date format used to be customised via configuration
Update Parser.java
Set default date format
Tweaked PR #66.
Merged #63.
Init default status
Add DEFAULT_STATUS constant
Update default.status in configuration
Slightly modified PR #58.
Merged in #58
Fixes #55
fix uri bugs on windows