Merge remote-tracking branch 'upstream/master'

Conflicts:
	html/partials/user.html
Remove unnecessary debugging stmt
Messaging between buyer and seller in Orders screen.
Remove unused variable
Reputation pledge retrieval doesn't block GUI
Remove reference to notary data
Travis fixes
Merge pull request #355 from hoffmabc/master

Updating Shipping Address and Shipping Payment Totals