various fixes

css/_reset.scss

@@ -1,13 +1,30 @@
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
 	border: 0;
+	font-size: 100%;
+	font: inherit;
 	margin: 0;
 	padding: 0;
+	vertical-align: baseline;
 }
 
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
 	display: block;
 }
 
+address, caption, cite, dfn, th, var {
+	font-style: normal;
+	font-weight: normal;
+}
+
+blockquote, q {
+	quotes: none;
+}
+
+blockquote:before, blockquote:after, q:before, q:after {
+	content: '';
+	content: none;
+}
+
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
@@ -16,23 +33,4 @@ table {
 th {
 	font-weight: bold;
 	text-align: left;
-}
-
-address, caption, cite, dfn, th, var {
-	font-style: normal;
-	font-weight: normal;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	font-size: 100%;
-	font-weight: bold;
-}
-
-blockquote, q {
-	quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after {
-	content: '';
-	content: none;
 }

css/_utilities.scss

@@ -3,7 +3,7 @@
 }
 
 img.alignleft {
-	margin-right: $column-gutter * 1px;
+	margin-right: $gutter * 1px;
 }
 
 .alignright {
@@ -11,13 +11,15 @@ img.alignleft {
 }
 
 img.alignright {
-	margin-left	: $column-gutter * 1px;
+	margin-left	: $gutter * 1px;
 }
 
 .aligncenter {
 	display: block;
-	margin-left: auto;
-	margin-right: auto;
+	margin: {
+		left: auto;
+		right: auto;
+	}
 }
 
 .clearfix {

css/_vars.scss

@@ -14,8 +14,8 @@ $mobile:                    640px;
 
 // Scaffolding
 
-$container-max-width: 			960;
-$column-count:				 			12;
-$column-gutter:				 			20;
+$max-width: 			          940px;
+$grid-columns:				 			12;
+$gutter:				 			      20;
 
 // Custom colours etc.

css/style.scss

@@ -4,7 +4,7 @@ Theme URI: http://github.com/mikefrancis/barebones
 Author: Mike Francis
 */
 
-// neat.bourbon.io Grid
+// neat.bourbon.io grid system
 
 @import 'bourbon/bourbon';
 @import 'neat/neat';
@@ -28,6 +28,6 @@ Author: Mike Francis
 
 @import 'nav';
 
-// Icons
+// FontAwesome icons
 
 @import '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';