Set indentation to 2
Merge pull request #8 from srod/new-indent

Set indentation to 2
Fix tests

Conflicts:
	Gruntfile.js
	karma.conf.js