Merge pull request #36 from infochimps-labs/stable

merge github/stable into gerrit/stable

merging already-reviewed changes