Caching, minification
Merge pull request #57 from davghouse/develop

Caching, minification