Squashed commit of the following:

commit 521cf3ad4bcd506bf63e959143c000de97f6f34d
Author: Jordan OMara <jomara@redhat.com>
Date:   Tue May 28 15:59:21 2013 -0400

    SCLification of some paths