Bumped Ruby to 2.1.2, cleanup