Let timing information include site loading (fixes nanoc/nanoc#303)
Update release notes for 3.6.3
Add missing attribution in release notes
Set 3.6.3 release date to today
Restore Ruby 1.8 compatibility in UglifyJS test
Fix watch command coding style
Remove broken nanoc.yaml watch test
Deprecated watch and autocompile commands
Merge branch 'release-3.6.x'
Make Gemfile compatible with Ruby 1.8.x
Restore Ruby 1.8.x compatibility
Merge branch 'release-3.6.x'
Merge branch 'master' of github.com:nanoc/nanoc
Merge branch 'master' into experimental-4.x

Conflicts:
	lib/nanoc/cli/commands/autocompile.rb
	lib/nanoc/cli/commands/watch.rb
	lib/nanoc/extra/file_proxy.rb
	test/cli/commands/test_watch.rb
Merge branch 'experimental-4.x' of github.com:ddfreyne/nanoc into experimental-4.x