Fix even more float problems

_includes/blocks/_base.liquid

@@ -1,5 +1,5 @@
 <div class="block block-{{ include.type }}
-{% if include.float %}float float-{{ include.float }}{% elsif include.float == "clear" %}float-clear{% endif %}
+{% if include.float == "clear" %}float-clear{% elsif include.float %}float float-{{ include.float }}{% endif %}
 {% if include.align %}align-{{ include.align }}{% endif %}" style="
 {% if include.width %}width: {{ include.width }};{% endif %}">
 	{{ include.content }}

_sass/_blocks.scss

@@ -42,6 +42,7 @@
 }
 
 .block.float + .block {
+	margin-top: 0em;
 }
 .block.float {
 }