FIX: deprication
ENH: adding tests
Merge branch 'master' into feature/build

Conflicts:
	binstar_client/commands/whoami.py
	binstar_client/scripts/cli.py