Squashed commit of the following:

commit 26748ad2073cd458dee363bdaf15a455f74a9f39
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:45:25 2014 -0700

    remote_commit