assets fix
Merge branch 'assets-opt-out'
Merge pull request #74 from jstrimpel/master

assets fixes and optimizations