Formatted and refactored
Fixed tests and added mock
Merge branch 'develop' into develop-mators11

Conflicts:
	cryptoim/cli.py