Merge remote-tracking branch 'upstream/master' into toc

Conflicts:
	lib/gollum/frontend/app.rb
	lib/gollum/markup.rb
	test/test_markup.rb

lib/gollum/page.rb

@@ -426,7 +426,7 @@ module Gollum
 
       dirs = self.path.split('/')
       dirs.pop
-      map = @wiki.tree_map_for(self.version.id)
+      map = @wiki.tree_map_for(@wiki.ref)
       while !dirs.empty?
         if page = find_page_in_tree(map, name, dirs.join('/'))
           page.parent_page = self