Squashed commit of the following:

commit a7ec40d31a2dfcb53b97b42d622bed80813e0f0f
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:39:33 2014 -0700

    remote_commit