Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development

Conflicts:
	features/post_award/institutional_proposal/create_funding_proposal.feature
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development
Small code style tweaks
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development

Conflicts:
	features/post_award/institutional_proposal/create_funding_proposal.feature
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development

Conflicts:
	features/post_award/institutional_proposal/create_funding_proposal.feature
Moved some steps into the background
Stylistic changes in step definitions.
Stylistic changes in step definitions.
Pull from Abe's dev branch