renamed views to fit python style standards. #525
improved line length/wrapping #525
fixed view names in other places #525
moved modelforms to sep file
created intermediate, moved some fields to it, tied app. #578
renamed givingprojectgrant #587 switched fkey to inter #578
prelim draft of script to update data. requires all old fields/models to still be there, along with new ones #578
script seems to have worked, good middle point for running it before updating all the code. #587 fixes from separating modelforms.
made some updates to code; need testing. #587
split screening status up, some for admin some for GP #587
new and updates fixtures #587
removed obsolete form
rename/update awards instead of copying all. script to verify that the update has worked
tested scripts, fixed bugs #587
Merge branch 'feature-transition' into feature-multgp

Conflicts:
	sjfnw/grants/models.py
updating fixtures #587
added missing import
fixed refs to modelforms
imports
updating fixtures for #56, also added a bit to them