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
Merge branch 'master' of https://github.com/Grouper/battleship