basic shipping skeleton set up
update makefile versioning
Merge branch 'master' into rapidxml
Merge branch 'ship'
Merge branch 'master' into rapidxml