Precompile assets...again
Merge branch 'master' into wo-compiled-assets

Conflicts:
	public/assets/manifest-5537a69347c24687ddf4a10c34455711.json
Merge pull request #54 from wh1tney/wo-compiled-assets

Precompile assets...again