Squashed commit of the following:

commit 42dee4d336fcdc37cf2f9dfdf2358e119c2ac237
Merge: b5cbea2 0059d18
Author: Craig Dennis <craigmdennis@gmail.com>
Date:   Sun Oct 12 13:07:54 2014 -0700

    Merge branch 'master' into develop

commit b5cbea241b67f56eefd4c422797970caa443c126
Author: Craig Dennis <craigmdennis@gmail.com>
Date:   Sun Oct 12 13:06:26 2014 -0700

    Various improvements