Merge branch hookup_peer_discovery-21

Closes github issue #21. This patch basically just adds peer discovery to the
main.py file. Now, on application startup the peer discovery process is started
as well.