Merge pull request #22 from pflannery/dev

Moved to coffeemugg for cleaner coffee to html