Update version number
Clean up, rework grunt file