A bit of a reorganization of scenarios. Added new one for updating Awards with Funding Proposal.
One more scenario plus helper code added.
Reorganized step definitions that refer to $ips.
Merge with AHeward's dev branch.