fixed tests
Merge branch 'master' into test_fix
fixed final tests
implemented simple bulk load script w/tests
added function to retrieve liquor amount
added get_liquor_inventory and associated print script
Merge branch 'script'
Merge branch 'output_types'

Conflicts:
	drinkz/db.py
	drinkz/test_drinkz.py