docker run error: ./env/bin/python: No such file or directory
Merge pull request #338 from hoffmabc/master

Floating point fix for shipping and shipping in purchases
run.sh: look harder for python binary and exit on failure

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #349 from benemorius/run-python

run.sh: look harder for python binary and exit on failure
remove [] from socket bind on ipv4 address

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge remote-tracking branch 'upstream/master' into fix-docker-python-virtualenv
only add [] to the uri if a proper ipv6 address is detected

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
remove python virtualenv dependence
Merge pull request #350 from benemorius/ipv6-fix

ipv6-regression-fix
Add more seeds. Fix #327.
clean up exception handling for ipv6 failover

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #352 from benemorius/exceptions

clean up exception handling for ipv6 failover
fix corrupt saving of peers to persistent storage

persistent peer storage is actually broken before this commit, which
is what is preventing peer discovery from working right after a client
restart

peer discovery should now occur immediately after starting the client

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #353 from benemorius/peerdiscovery-fix

fix corrupt saving of peers to persistent storage
Merge pull request #348 from y12studio/fix-docker-python-virtualenv

docker run error: ./env/bin/python: No such file or directory
Merge pull request #351 from dionyziz/seeds

Add more seeds. Fix #327.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	html/partials/user.html