Merge pull request #37 from xtuple/master

catching up
toDo test shell completed
Merge pull request #131 from mikerodonnell89/toDoTest

To do test shell