add expense types to WHSC form
Merge pull request #143 from 18F/expense-type

add expense types to WHSC form
Merge remote-tracking branch 'origin/master' into whsc-approver

Conflicts:
	spec/features/whsc_proposal_spec.rb