Fixing grunt server task to match gh-pages environment; fixing directive
path bug related to this
Merge branch 'master' into gh-pages
Merging fixes from master