diff --git a/Gruntfile.js b/Gruntfile.js
index 0b216269..2df9be6d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,48 +1,53 @@
-grunt.loadNpmTasks('grunt-contrib-connect');
-grunt.loadNpmTasks('grunt-contrib-jshint');
-//grunt.loadNpmTasks('grunt-contrib-nodeunit');
-grunt.loadNpmTasks('grunt-ghost');
-
-grunt.registerTask('test', ['jshint', /*'nodeunit',*/ 'connect', 'ghost']);
-
-jshint: {
-	/*options: {
-		jshintrc: '.jshintrc'
-	},*/
-	files: [
-		'Gruntfile.js',
-		'package.json',
-		'source/**/*.js'/*,
-		'<%= nodeunit.tests %>'*/
-	]
-},
-/*
-nodeunit: {
-	tests: ['tests/nodeunit/*_test.js']
-},
-*/
-connect: {
-	www: {
-		options: {
-			base: 'source',
-			port: 4545
-		}
-	}
-},
-ghost: {
-	test: {
-		files: [{
-			src: ['tests/integration/casperjs/*_test.js']
-		}]
-	},
-	options: {
-		args: {
-			baseUrl: 'http://localhost:' +
-				'<%= connect.www.options.port %>/'
+module.exports = function(grunt) {
+	grunt.initConfig({
+		jshint: {
+			/*options: {
+				jshintrc: '.jshintrc'
+			},*/
+			files: [
+				'Gruntfile.js',
+				'package.json',
+				'source/**/*.js'/*,
+				'<%= nodeunit.tests %>'*/
+			]
 		},
-		direct: false,
-		logLevel: 'error',
-		printCommand: false,
-		printFilePaths: true
-	}
-}
\ No newline at end of file
+		/*
+		nodeunit: {
+			tests: ['tests/nodeunit/*_test.js']
+		},
+		*/
+		connect: {
+			www: {
+				options: {
+					base: 'source',
+					port: 4545
+				}
+			}
+		},
+		ghost: {
+			test: {
+				files: [{
+					src: ['tests/integration/casperjs/*_test.js']
+				}]
+			},
+			options: {
+				args: {
+					baseUrl: 'http://localhost:' +
+						'<%= connect.www.options.port %>/'
+				},
+				direct: false,
+				logLevel: 'error',
+				printCommand: false,
+				printFilePaths: true
+			}
+		}
+	});
+
+	grunt.loadNpmTasks('grunt-contrib-connect');
+	grunt.loadNpmTasks('grunt-contrib-jshint');
+	//grunt.loadNpmTasks('grunt-contrib-nodeunit');
+	grunt.loadNpmTasks('grunt-ghost');
+
+	grunt.registerTask('test', ['jshint', /*'nodeunit',*/ 'connect', 'ghost']);
+
+};
diff --git a/Makefile b/Makefile
deleted file mode 100644
index fd40ada0..00000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-test:
-	jshint js/*.js
\ No newline at end of file