stuff
Merge branch 'master' into dustin
messages and minor bug fixes
'Merge master to dustin
'

Merge branch 'dustin'
Started writing tests. Changed to outstream
Rakefile working. Most tests still skipped
most tests
Tests passing