Merge branch 'master' into feature/gollum-lib

Conflicts:
	lib/gollum/markup.rb

README.md

@@ -284,6 +284,12 @@ specified, default alignment is `left`.
 
     [[gollum.png|float]]
 
+By default text will fill up all the space around the image. To control how
+much should show up use this tag to stop and start a new block so that
+additional content doesn't fill in.
+
+    [[_]]
+
 To specify a max-width, use the `width=` option. Units must be specified in
 either `px` or `em`.
 

lib/gollum/public/gollum/css/gollum.css

@@ -729,3 +729,6 @@ ul.actions {
   padding: 0.25em;
 }
 
+.clearfloats {
+  clear: both;
+}