Merge pull request #3 from xtuple/master

catching up
Merge pull request #4 from xtuple/master

catching up
Merge pull request #5 from xtuple/master

catching up
Merge pull request #6 from xtuple/master

catching up
Merge pull request #36 from mikerodonnell89/master

catching up