Merge pull request #1 from wylie/develop

final commit for the night
fixing for pages
fixing for pages
updating the index
adding minified
Merge pull request #2 from wylie/fixes

Fixes