Merge pull request #1 from infochimps-labs/master

merge github/master into gerrit/master