Merge branch 'release/2.3.0' into develop
Merge branch 'master' into develop
new deps for grunt
initial gruntfile
changing npm scripts to use grunt tasks
config travis for grunt test
removing Makefile, not needed with grunt
updating readme to reflect new grunt tasks
Merge branch 'feature/grunt' into develop
version bump
Merge branch 'release/2.3.1'