tidy up and fix merge balls up
added consensus caching - probably needs some further testing.
fix refactor error
made Consensus a singleton, reformatted code to appear OK on github, added ConsensusExample.
remoe non-tor socks proxy
remove obsolete return value
minor largely inconsequential tweaks.
Resolved in favour of latest version.

Merge https://github.com/drgowen/tor-research-framework

Conflicts:
	src/main/java/tor/OnionRouter.java