Lots of restructuring. I hope this commit works
Merge branch 'master' of git@github.com:penguinmenac3/AgeOfSail.git

Conflicts:
	src/main/java/ageofsail/Ship.java
	src/main/java/ageofsail/World.java
	src/main/java/ageofsail/impl/CaribbeanSea.java
	src/main/java/ageofsail/impl/PirateShip.java