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