Merged upstream
Merge branch 'master' of git://github.com/jonbullock/JBake
Merge branch 'master' of git://github.com/jonbullock/JBake
Merge branch 'master' of git://github.com/jonbullock/JBake

Conflicts:
	README.md
Changed dependencies related to groovy templates to reduce distro size
Merge pull request #103 from mismatch/dist_size_reduction

Distribution size reduction