Updated to fix specs and bump to mongoid 3.1