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

commit 0bd1766cf1234621bdaa4805d5dc42949433e151
Author: Lillian Mahoney <lillian.lynn.mahoney@gmail.com>
Date:   Wed Jan 7 16:29:12 2015 -0600

    testing

lillian-lemmer/hypatia,Applemann/hypatia,lillian-lemmer/hypatia,hypatia-software-org/hypatia-engine,hypatia-software-org/hypatia-engine,brechin/hypatia,brechin/hypatia,Applemann/hypatia