Fix merge conflict.
Comile assets locally.
Fix precompile error.
Merge pull request #27 from jjlangholtz/jjl

Prepare for deployment.