diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..7c1af9a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 0e3fcef..046c99d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(grunt){
-
+	require('jit-grunt')(grunt);
 	require('time-grunt')(grunt);
 
 	// Configurable paths
@@ -34,7 +34,8 @@ module.exports = function(grunt){
 		sass: {
 			options: {
 				compass: true,
-				update: true
+				update: true,
+				sourcemap: 'none'
 			},
 			server: {
 				files: [{
@@ -50,7 +51,9 @@ module.exports = function(grunt){
 		// Add vendor prefixed styles
 		autoprefixer: {
 			options: {
-				browsers: ['> 1%', 'Android >= 2.1', 'Chrome >= 21', 'Explorer >= 7', 'Firefox >= 17', 'Opera >= 12.1', 'Safari >= 6.0']
+				browsers: ['last 2 versions'],
+				remove: false,
+				cascade: false
 			},
 			dist: {
 				files: [{
@@ -84,7 +87,7 @@ module.exports = function(grunt){
 		watch: {
 			scss: {
 				files: ['<%= config.base %>/**/*.{scss,sass}'],
-				tasks: ['sass:server', 'autoprefixer', 'cssmin']
+				tasks: ['sass:server', 'autoprefixer']
 			},
 			js: {
 				files: [
@@ -111,15 +114,6 @@ module.exports = function(grunt){
 
 	});
 
-	grunt.loadNpmTasks('grunt-contrib-jshint');
-	//grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-sass');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-autoprefixer');
-	grunt.loadNpmTasks('grunt-concurrent');
-	grunt.loadNpmTasks('grunt-shell');
-
 	grunt.registerTask('default', ['sass:server', 'autoprefixer', 'cssmin', 'concurrent']);
 
 };
diff --git a/config.rb b/config.rb
index b9b7e67..d201eee 100644
--- a/config.rb
+++ b/config.rb
@@ -1,6 +1,6 @@
 # First, require any additional compass plugins installed on your system.
 # require 'zen-grids'
-require 'susy'
+# require 'susy'
 # require 'breakpoint'
 
 
diff --git a/package.json b/package.json
index 83ff6df..f986c2b 100644
--- a/package.json
+++ b/package.json
@@ -7,19 +7,19 @@
 	"scripts": {
 		"start": "grunt"
 	},
-	"dependencies": {
-	},
+	"dependencies": {},
 	"devDependencies": {
 		"grunt": "~0.4.5",
-		"grunt-autoprefixer": "^3.0.0",
-		"grunt-concurrent": "~1.0.0",
+		"grunt-autoprefixer": "^3.0.3",
+		"grunt-concurrent": "~1.0.1",
 		"grunt-contrib-cssmin": "~0.12.3",
 		"grunt-contrib-jshint": "~0.11.2",
 		"grunt-contrib-sass": "^0.9.2",
 		"grunt-contrib-uglify": "~0.9.1",
 		"grunt-contrib-watch": "~0.6.1",
+		"grunt-shell": "^1.1.2",
+		"jit-grunt": "^0.9.1",
 		"jshint-stylish": "^2.0.0",
-        "time-grunt": "^1.2.1",
-        "grunt-shell": "^1.1.2"
+		"time-grunt": "^1.2.1"
 	}
 }