Sun Dec  1 07:20:29 MST 2013

test:
 Refactored Makefile to accomidate problems when testing database
 functionality