Merge pull request #4 from jwhyte88/Developer

End of Wednesday
refactored some tests and made the check_ship_size test pass
added ship orientation test
managed to place a horizontalish ship
Resolved (hopefully) horizontal/vertical confusion
refactored slightly and removed some unused methods/tests
Merge pull request #5 from Arepo/Developer

Developer
Defunkt commit
I am merging Developer with Master
Merge branch 'master' into Developer
ship placing feature improved
post-Enrique cleaning
Water commit