Updated gems
Fix failing test, nil + Integer yields NoMethodError in ruby 2.1.0
Ensure initial positions are :across or :down
Use new mocha/minitest syntax
Add rake to Gemfile so rake works
Merge branch 'fix_tests_for_2.1'