Working on speeding up nhibernate
Merge branch 'master' of https://github.com/jdehlin/MatrixApi