bug fix and cleanup
merge
Merge pull request #7 from slifty/master

A few important patches to bill search