One-line-comment
Add migration that relates users to opportunities
Added test for user to opportunity association
Merge branch 'master' into associate-users-and-opportunities
Modified how User-Opp association works.

1. Changed migration to add user_id column to Opportunity.
Merge branch 'master' into associate-users-and-opportunities
Changed list route to only show models belonging to the user
Fixed test
Added req.user.id to saved opportunities. (Was hardcoded to 1).
Merge branch 'master' into associate-users-and-opportunities

Conflicts:
	controllers/admin.js
Adding better option override process, begin rewrite of options list.
Fixing refs to choices list.
Cleanup opp queryform structure.
Committing.  Gonna try somethign else.
Improve override pattern.
Removing junk.
Various fundme wizard fields.
Removing choiceOther from industry.
Fixing various conditional fields.
Fixing override gen.