Squashed commit of the following:

commit 5389df332266760b94d95f4579807bfaa6a934b8
Author: Jason Irish <jirish@dynamicdoes.com>
Date:   Sat Nov 16 19:14:16 2013 -0600

    moved config to yaml, model cleanup

commit 0149bad5cfb6926c3ff4c6787373091da021cb4f
Author: Jason Irish <jirish@dynamicdoes.com>
Date:   Sat Nov 16 18:51:10 2013 -0600

    added allowed_actions to Locator page for 3.1