Various ES changes

Budget; recurring; split
Merge pull request #31 from rcangiano/master

Various ES changes (budget, recurring & split)