Merge pull request #21 from xtuple/master

Catch up.
Merge pull request #22 from xtuple/master

Catch up.
Merge pull request #23 from xtuple/master

catch up.
Merge pull request #24 from xtuple/master

Catch up.
Merge pull request #25 from xtuple/master

catch up.
Merge pull request #26 from xtuple/master

Catch up.
Merge pull request #152 from jrogelstad/master

catch up.