Location of short/intermediate term funds?

[gecko10x]

Where do you keep short or intermediate term funds?
For example, funds for a new car that you anticipate needing in ~ 7yrs would be considered intermediate term.
An "emergency" fund would probably be considered either short or intermediate term, but for the sake of this question, lets assume the following things would NOT come from an "emergency" fund:
- house repair/maint < $1000
- car repair/main < $1000
- medical
In addition, I have ~ 0.5-1 month of expense buffer in checking account, $1k+/mo of cash flow that could be diverted, and $50k+ in available credit.

I am having trouble deciding where to put any additional $$, and even how much additional I should set aside. Thoughts?

[MDM]

With a 7 year horizon for investment funds I'd
  - be aggressive if I thought cash flow for normal expenses was reasonably safe.
  - be conservative if I were relying on the investment funds to provide cash flow over that time.

Your buffer seems reasonable.