Merge pull request #5 from infochimps-labs/master

merge github/master into gerrit/master

merging leslie into gerrit