Merge pull request #296 from mballance-sf/master

Correction for #316
Merge pull request #297 from mballance-sf/master

Various bug fixes
""
""
""
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/tutorial.xml
Updates to incorporate the tutorial into 'help' and the webpage
Test fixups and correction for #317