migrating changes from ec2
Merge branch 'prod'
Merge branch 'master' of github.com:glg/nectar
fixing check for auth options
Merge branch 'master' into prod