Refactored message logging, added some decryptor/encryptor tests, fixed whitespace, fixed xmpp tests (fixed #6)
Refactored cli
Merge branch 'develop-mators11' of github.com:oskopek/CryptoIM into develop-mators11

Conflicts:
	cryptoim/cli.py
Fixed up cli logic, fixed cli tests, refactored