Merge pull request #12 from infochimps-labs/master

merge github/master into gerrit/master

merging in straightforward submodule bump