Get grunt serve working
Merge branch 'master' of github.com:awaxman11/gh-tester