Sync up with webapp

(#35)

Did I get this right? Went a little further than just the Gruntfile. Let me know if I need to pull anything out, or plop anything in!