merged Gruntfile and package.json from master.
added in configurations for Karma.