Updated private
Updated docs
Merged conflicts
Merge branch 'master' of github.com:offlinehacker/ethertest

Conflicts:
	docs/glossary.rst