Added layout & record patches from esa project.
Implemented patches now passing all tests except one in ruby 1.9.2.
Version to 2.1.pre02.