Squashed commit of the following:

commit a1df4291a0303f7eb22bf726943ec442215376b4
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:49:18 2014 -0700

    remote_commit