Squashed commit of the following:

commit 9f67d52f93e0388425f92bd61ae00bb7fdc9b995
Author: Brian Litzinger <blitzing@nerdery.com>
Date:   Fri Oct 31 08:55:52 2014 -0500

    Fixed reference to a renamed/moved function.