work in progress
local merge

Merge branch 'master' into testing
work in progress
local merge

Merge branch 'master' into testing
functional testing suite of unit tests
local merge

Merge branch 'master' into testing
really complete test suite
Merge pull request #90 from chorus-frogs-2014/testing

Testing