Merge pull request #1 from CultConspiracy/master

Fix namespacing issues
Adds deployment instructions for heroku to README
Updates README formatting
Fixes problem with exporting shipments from a country that does not have states
Mark inventory items as shipped.
Wrapped in update in ship? check.