Added basic grunt support
Merge branch 'feature/grunt'