Merge pull request #616 from rustyswayne/master

Cleanup
Merge remote-tracking branch 'merchello/master' into 1.1.1
Merge branch '1.1.1' of https://github.com/rustyswayne/Merchello into 1.1.1
Adds email to shipment