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
Fixed a typo
Fixed a typo
Fixed a typo
removed test drive link
Reputation pledge retrieval doesn't block GUI
Remove reference to notary data
Merge pull request #362 from SamPatt/master

removed test drive link
Travis fixes
Merge pull request #361 from himynameismartin/master

Fixed some typo in the documentation
Merge pull request #355 from hoffmabc/master

Updating Shipping Address and Shipping Payment Totals
Use .get() instead of direct access
Merge pull request #364 from hoffmabc/master

Use .get() instead of direct access
Bug fix with latest merge
Merge pull request #368 from hoffmabc/master

Bug fix with latest merge
add missing ip/port arguments to run.sh help output

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
don't override local ip address