Update code-related plugins
Merge branch 'update-plugins' into source

Conflicts:
	Gemfile
	plugins/code_block.rb
	plugins/include_code.rb
	plugins/pygments_code.rb