Merge pull request #352 from jpecht/master

minified js via grunt
Merge remote-tracking branch 'upstream/master'