merged changes from 3.2.x branch
merged changes from 3.2.x branch

--HG--
rename : lib/nanoc3/filters/colorize_syntax.rb => lib/nanoc/filters/colorize_syntax.rb

barraq/nanoc,RubenVerborgh/nanoc,nanoc/nanoc,hilohiro/nanoc,legallybrown/nanoc,gjtorikian/nanoc,remko/nanoc