Merge branch 'master' into experimental-4.x

Conflicts:
	lib/nanoc/cli/commands/watch.rb
Merge branch 'experimental-4.x' of github.com:ddfreyne/nanoc into experimental-4.x
Merge branch 'experimental-4.x' into experimental-4.x-pathlike-identifiers