Cleaned up Gruntfile
updated the readme file
updated readme file
Merge branch 'feature/update-readme' into dev

Conflicts:
	Gruntfile.js