Fixed few errors and PEP8
revert these changes
Merge remote-tracking branch 'upstream/master' into fix-issues1

Conflicts:
	tests/cli/test_User.py
Removed unnecessary changes
Merge pull request #78 from kbidarkar/fix-issues1

Fixed few errors and PEP8