Initial dist subtree commit
Merging updated master branch into gh-pages branch prior to running grunt build.

Merge branch 'master' into gh-pages
Updated branch with latest changes for deployment