Merge pull request #58 from armicron/master

Fix for issue #51
Fix Tox link
Merge pull request #59 from aidanhs/patch-1

Fix Tox link
Added Mailpile
Merge pull request #60 from pallih/patch-1

Added Mailpile
Added Village Telco
Merge pull request #61 from stevesong/master

Added Village Telco
Added wlan slovenija and Peopl's Open Network
Merge pull request #62 from mitar/patch-1

Added wlan slovenija and Peopl's Open Network
merged recent changes from upstream