Fix #991
Compile typescript files from ant task, pull grunt out of build but keep around for watch task, make "watch" grunt's default task.  Simplify package.json.