Squashed commit of the following:

commit 157191ace17650702c96b19e08723dc7c82a8c19
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:21:14 2014 -0700

    remote_commit