Mattdrayer/rebase 20140722b

@antoviaque -- here is my first go-round with the cherry picking -- I didn't squash commits because I thought it would be helpful to review my changes for each pick as a first step.  I still need to run the unit tests and confirm that everything is working as expected -- I have a feeling there will be some additional changes needed.  Once everything is looking good I will squash the commits and we can merge the changes.

@chrisndodge, FYI