Pulled over flat files tests from object-fusion2 fork
Moved off of tape and back onto mocha for kitchen sink tests
Added CHANGELOG
Merge remote-tracking branch 'origin/master'
Corrected CHANGELOG