Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar
Enable UPNP by default
Enable UPNP by default
added UDP mapping for p2p port
added UDP mapping for p2p port
Merge branch 'master' into proof_of_burn
Replaced sqlite3 with pysqlcipher and encrypted db.
Added pysqlcipher dependency to Dockerfile & Vagrantfile.
Added a TODO notice for grabbing passphrase from the user.
Creating a centralizated requierements file.
Creating a centralizated requierements file.
Merge pull request #212 from votaguz/adding_requirements_file

Creating a centralizated requierements file.
Merge pull request #212 from votaguz/adding_requirements_file

Creating a centralizated requierements file.
formatting
formatting
merge from master and refactors.
merge from master and refactors.
PEP8 formatting, got rid of '.has_key()' deprecated over 'key in dict'
PEP8 formatting, got rid of '.has_key()' deprecated over 'key in dict'
Upped the timeout limit