Modified tests
Merge branch 'master' of github.com:cotag/confabulator
Merging the branches lol
Initial ability to transcode