jrconlin/pushgo — pull request #46 by jrconlin (2013-08-13 03:20:45+00:00)
Title: Merging from bbangert

Clear conflicts in jrconlin code and return to sanity.