Fix for task 1, 2, 6
Merge pull request #6 from VoltDB/task126

Fix for task 1, 2, 6