Major cleanup; establish content directories
Merge branch 'gh-pages' of https://github.com/futtara/starter into gh-pages
Fix meerge