Issue 575: Migration to rails 3.1

A continuation of https://github.com/MarkUsProject/Markus/pull/1153
In reference to https://github.com/MarkUsProject/Markus/issues/575

Will be working on it this weekend.