clean up repo & fixed Gruntfile
Merge remote-tracking branch 'origin/master' into ls_test

Conflicts:
	Gruntfile.coffee
	demos/index.html