Formatting gruntfile correctly

Gruntfile.js

@@ -1,48 +1,53 @@
-grunt.loadNpmTasks('grunt-contrib-connect');
+module.exports = function(grunt) {
-grunt.loadNpmTasks('grunt-contrib-jshint');
+	grunt.initConfig({
-//grunt.loadNpmTasks('grunt-contrib-nodeunit');
+		jshint: {
-grunt.loadNpmTasks('grunt-ghost');
+			/*options: {
-
+				jshintrc: '.jshintrc'
-grunt.registerTask('test', ['jshint', /*'nodeunit',*/ 'connect', 'ghost']);
+			},*/
-
+			files: [
-jshint: {
+				'Gruntfile.js',
-	/*options: {
+				'package.json',
-		jshintrc: '.jshintrc'
+				'source/**/*.js'/*,
-	},*/
+				'<%= nodeunit.tests %>'*/
-	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 %>/'
 		},
-		direct: false,
+		/*
-		logLevel: 'error',
+		nodeunit: {
-		printCommand: false,
+			tests: ['tests/nodeunit/*_test.js']
-		printFilePaths: true
+		},
-	}
+		*/
-}
+		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']);
+
+};

Makefile

@@ -1,2 +0,0 @@
-test:
-	jshint js/*.js