using jam for client-side assets
Merge branch 'dev' of https://github.com/Chandler/flesh into dev