variable renaming, refactoring to setscheme, more tests
change to relative paths for github-hosted url
Merge branch 'master' into gh-pages