Squashed commit of the following:
Squashed commit of the following:

commit 89f69eb104cac4865c2ba630fd78247a3be0901b
Author: e2tha-e <ee@electric-eloquence.io>
Date:   Tue Nov 1 20:00:13 2016 -0400

    code cleanup

electric-eloquence/fepper-drupal,electric-eloquence/fepper-drupal,electric-eloquence/fepper-drupal,electric-eloquence/fepper-drupal