Upgrade rails, shoulda and mocha.
Plus whitespace fixing. :-/