Add a route (GET /budgets/with_entries)

Also removes the amount_so_far column
Merge branch 'master' into get-all-budgets-and-entries

Conflicts:
	config/routes.rb