Bump version to 3.6.11
Merge branch 'release-3.6.x' of github.com:nanoc/nanoc into release-3.6.x

Conflicts:
	Gemfile.lock
Merge branch 'release-3.6.x'

Conflicts:
	Gemfile.lock
	NEWS.md
	lib/nanoc/version.rb
Upgrade dependencies
Merge branch 'release-3.6.x'

Conflicts:
	Gemfile.lock
Do not wrap Rouge output twice
Remove double Rouge wrapping
Explain what double wrapping means
Delete root temp directory eventually
Remove psych from Gemfile
Merge pull request #443 from nanoc/fix-rouge-wrapping

Fix Rouge wrapping
Merge pull request #444 from nanoc/remove-root-tmp-directory

Delete root temp directory eventually
Delete root temp directory eventually
Merge branch 'release-3.6.x'
Add recent fixes to release notes
Set release date of 3.7.0 to today
Fix Sass imports outside of filter
Merge pull request #446 from nanoc/fix-sass-imports-without-filter

Fix Sass imports outside of filter
make sure there is a Gemfile before loading bundler
Merge pull request #448 from mpapis/patch-1

make sure there is a Gemfile before loading bundler