Merge branch 'feature/boto-iam'

Fixes boto with IAM, puts boto.cfg in config/