fixed slight mistake
various other changes,

Set up a framework for bill categorization
Merge remote-tracking branch 'origin/gh-pages'