Merging Ship.js
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh