Merge pull request #1 from Netflix/master

Sync with Netflix
Fix for startup/compilatoin with the new AWS library
Merge pull request #132 from vfilanovsky/master

Fixes #131