progress checkpoint

seeds implemented but not tested.
almost done creating form flow for 2 choice control widget.
lots of fixes and improvements to the STI implementation. Child classes now return both their partial view and any data they need.
we forgot to git rm these unnedeeded migrations
Merge branch 'master' into alexmain

Conflicts:
	db/seeds.rb
various fixes and integration