Merge branch 'citation-support' into mygollum
Merge branch 'mygollum' of github.com:pipex/gollum into mygollum