Improve build process, tidy up gruntfile Fixes #5