Merge branch 'master' into feature/gollum-lib

Conflicts:
	lib/gollum/markup.rb
	test/test_gitcode.rb

bin/gollum

@@ -49,6 +49,10 @@ opts = OptionParser.new do |opts|
     wiki_options[:css] = true
   end
 
+  opts.on("--js", "Inject custom js. Uses custom.js from root repository") do
+    wiki_options[:js] = true
+  end
+
   opts.on("--page-file-dir [PATH]", "Specify the sub directory for all page files (default: repository root).") do |path|
     wiki_options[:page_file_dir] = path
   end