cleaning up demos to use vec2
cleanup code
Merge branch 'master' into gh-pages
updating build