More improts cleanup
Merge branch 'master' of github.com:futures/ff-modeshape-prototype