Squashed commit of the following:

commit e384ea949de84ee4c7a816b25b3a219e8a60aa98
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Dec 17 15:18:40 2013 -0700

    Re-added a line of code to check an IP's status. This was removed accidentally

commit 6a177fc4d92b2f8202d9938872f167f8c0f35978
Merge: 92d47e0 8f2580c
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Dec 17 14:32:42 2013 -0700

    Merge remote-tracking branch 'upstream/development' into development

    * upstream/development:
      Updates related to trying to remove an FP from an Award.
      Updates related to trying to remove an FP from an Award.
      Had to create a specialized step definition for a particular scenario.
      Removed some dummy code that wasn't supposed to be there.
      Removal of the $ips global variable from the step definitions for funding awards. Fixes to a verification step definition.

    Conflicts:
    	features/step_definitions/awards/award_fund.rb

commit 92d47e071b11365101c24188154e765345c0ca78
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Dec 17 14:24:10 2013 -0700

    created a new scenario to check for the generation of new ip's.

commit 8f2580c5ba178708c86c86fcb467e1ee06bcd44f
Merge: 16d51b5 b6c71ce
Author: Abraham Heward <aheward@rsmart.com>
Date:   Tue Dec 17 11:31:36 2013 -0700

    Merge remote-tracking branch 'origin/development' into development

commit 16d51b5bb715833f1844b186f57eca30b0689751
Author: Abraham Heward <aheward@rsmart.com>
Date:   Tue Dec 17 11:31:13 2013 -0700

    Updates related to trying to remove an FP from an Award.

commit b6c71ce3d6a82918a9d1f609d91316c3f15c86bf
Author: Abraham Heward <aheward@rsmart.com>
Date:   Tue Dec 17 11:31:13 2013 -0700

    Updates related to trying to remove an FP from an Award.

commit dca571c7cc867fdde167999ddf56e065e8b302ca
Author: Abraham Heward <aheward@rsmart.com>
Date:   Mon Dec 16 12:36:48 2013 -0700

    Had to create a specialized step definition for a particular scenario.