Update Gemfile.lock
Bump version to 3.6.8
Set release date of 3.6.8 to today
Ignore files ending in ~
Update Gemfile.lock
Merge branch 'release-3.6.x'

Conflicts:
	Gemfile.lock
	NEWS.md
	lib/nanoc/version.rb