refactoring stuff ... remove all unnecessary whitespaces and paragraphs
update mongoid to 3.1