HOTFIX - grunt watch and other tasks not working
Merge pull request #158 from nys-its/HOTFIX-grunt-watch-fix

HOTFIX - grunt watch and other tasks not working
fixed merriweather font display issue
fixed merriweather font display issue
Merge branch 'dev' of https://github.com/courtney-jordan/excelsior into dev

Conflicts:
	Gruntfile.js
	excelsior.zip