Update time/expense to handle new types.
Merge branch 'xtuple'
Merge pull request #77 from jrogelstad/master

Update time/expense to handle new types.