Merge pull request #24 from infochimps-labs/master

merge github/master into gerrit/master

merging old leslie branch into gerrit!