Merge remote-tracking branch 'origin/jboone_refactor_20130906'

Time to move all my changes to master and get rid of this ever-lengthening branch.