print warning if netlib and mitmproxy versions are different.
Serve correct certs from app. Enable Windows and Android icons.
Revert "Move the doc tree out into its own repo."

This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf.
Android doc update.
Use the mitm.it domain for the app, turn it on by default.
Instructions for adding mitmproxy certificates to the Java trust store.

Fixes #146
Nicer layout for cert install options.
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
Adjust docs for web app certificate installation.
travis: irc notifications
Update contributors.
move test requirements out of main requirements.txt
Changelog.
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
actually remove test dependencies from requirements.txt
docs: fix spacing of page headers
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
merge master