first step in upgrading to rails 4.1
removed deprecated methods
fixed failing tests
whitespace edits