Merge pull request #17 from clottman/goodness

Goodness
other equal stuff
added Casseys tests
nurse test changes
Merge pull request #18 from clottman/newSillyBranch

New silly branch
Merge branch 'master' into Cassey
Merge pull request #19 from clottman/Cassey

Cassey