cleanup and fix resizing/viewport bugs
wrapping fix
added sheep/water toggles
Merge branch 'master' into gh-pages