Make tests run on Ruby 2.0
Fix various composition refactoring bugs, update UI
Up version