Squashed commit of the following:

commit d540fdaa3e0a3ab7eac7015e783a478ea70e1327
Merge: 9a7787b 2b02be8
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Feb 21 12:05:47 2014 -0700

    Merge with Abe

commit 9a7787b867fdad8a149592dea8faabde6cddb9c1
Merge: 4666fb4 1612f58
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Feb 21 11:51:27 2014 -0700

    There are now separate 'required field' steps for each document type. The documents each share certain fields, but the error messages are not the same.

commit 4666fb45423d27b89b73b4a717616b47a9f31c3a
Merge: 1d84e8a 4a49c13
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Feb 21 10:28:36 2014 -0700

    Merge with Abe

commit 1d84e8a72b01d3d3e2c4d85c1671b5a64835a77e
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Feb 20 14:36:10 2014 -0700

    error message-related changes to our errors.rb file

commit 2033d260f9049041c1cc1c9afe14b9cda03d2753
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Feb 20 11:29:03 2014 -0700

    Several quick fixes

commit aacf61cccce4d9de4d58607b4464b820bdc3bcf7
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Feb 19 09:12:14 2014 -0700

    Removed the 'raise' from our global_buttons 'save' method.

commit 4708894f21c1e71631e61877904bea7444cecbbf
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Feb 18 12:42:07 2014 -0700

    Several changes in this commit (sorry about that)

    Replaced 'snake_case' with 'damballa' for steps with missing parameters.
    Added the necessary Dept Name for our AOR (s2s) user.
Correction made to the irb protocol feature file
correction to the award_edit file in which I forgot to remove the hardcoded login with the institutional proposal user.
merge from my test branch.