LocalJumpError on Ruby 2.1.2, Rails 4.1.4

Also did some cleaning up...