updating testapp database settings for django 1.4
add failing unit test for [ccollins/milkman#19]
[ccollins/milkman#19] MilkTruck.generators should not be shared between MilkTruck instances
merge wilfred and ccollins
Merge pull request #21 from skyl/master

merge wilfred and ccollins