updated for new AWS CLI
created empty .pyhistory
Merge branch 'master' of github.com:vpatil/settings

Conflicts:
	.bashrc