updates
Merge branch 'gh-pages' of github.com:dbashford/mimosa.io into gh-pages