Merge branch 'master' into develop

Quickly merging in the Gruntfile fix.
Added links to directory pages on home.
Merge branch 'dirlinks' into develop

Merging in changes from directory links on home page branch.
Merge branch 'develop'

And now merging directory links into master.