Merge pull request #34 from cdmiller/master

New ShipOdyssey merging in Ryan's changes v2013-05-02