fix gruntfile typo
lots of work on wftda html and coffee. needs rafactor
Merge remote-tracking branch 'origin/master'