work on Fish
making pretty
updating skeleton
Merge branch 'master' into gh-pages
bringing into parity with master