Move gollum back end to gollum-lib #647
Merge branch 'master' into feature/gollum-lib

Conflicts:
	lib/gollum/markup.rb
Merge branch 'master' into feature/gollum-lib

Conflicts:
	lib/gollum/markup.rb
	test/test_gitcode.rb
Merge pull request #664 from jamieoliver/feature/gollum-lib

Move gollum back end to gollum-lib #647
Update gemspec
Tweak TeX math delimiters.
Merge pull request #667 from cpence/master

Tweak TeX math delimiters
Update MathJax docs
README mention of gollum-lib and whitespace fixes
Syntax highlighting in README
Upgrade to sinatra 1.4
Merge pull request #669 from gollum/sinatra1.4

Upgrade to sinatra 1.4
Use latest sinatra
Update shoulda
Try removing deps
Merge pull request #672 from bootstraponline/master

Try removing dependencies
Fix #668
Update the example of config.ru in the README
Fix error when running with --irb option
uninitialized constant Gollum::Wiki (NameError)
Merge pull request #675 from uk-ar/fix-error-in-irb

Fix error when running with --irb option