Squashed commit of the following:

commit 1d5cc3487a4a58f68e08c4a3696d926913bdaf6a
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon Jun 10 17:02:54 2013 -0400

    fixed load taxonomy function

commit 624ee2ac2b9c9f7d67004d5c0ae97d1f862ec522
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon Jun 10 16:52:49 2013 -0400

    added taxonomy stuff to uprofile model

commit edf2cd3d9e536b81b2c427e1d0ab09eea63e2c4e
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon May 20 17:31:14 2013 -0400

    -fixed conditional validation

commit 05a9b3bde631e72ec6c25c61b163b19d8a894469
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon May 20 17:21:00 2013 -0400

    -added acts_as_list back to question model
    -validates_presence_of :new_answer_options is only on update now

commit a793a8a766c7de7c262a96fa56ea616d572b004d
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon May 20 16:59:53 2013 -0400

    -took out acts_as_list from questions

commit ba17f744e68ad8308cf796cc188bf0abffe00511
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Tue May 14 17:41:24 2013 -0400

    -added organization association to opportunity model

commit a6d756e8615295d6f79e0efaf8737757e907612d
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon May 13 11:08:10 2013 -0400

    -fixed typo in questionnaire instance model

commit 0eda368f97a191b612df97215e361c1139f00c5d
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Fri May 10 16:52:30 2013 -0400

    -added a few methods to questionnaire_instance model for checking
    permissions

commit 05c1fdce4c9990d95ddac94d97fbfe33236ac51d
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Fri May 10 16:16:52 2013 -0400

    -added published? method to questionnaire model

commit 525d7ea8c98b67bc9ad8e8d1071586b4c42491df
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Thu May 9 10:37:13 2013 -0400

    -added opportunities_questionnaires association to questionnaire model

commit a7cb7021b7b1c2e6678ba1aa2cc91ce2890bcaa6
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Wed May 8 18:06:32 2013 -0400

    -added some missing require statements

commit a4799fe67b7e287db1bcefff6bb4141ca3077942
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Wed May 8 17:44:44 2013 -0400

    -fixed broken association

commit 480e95ef1969d07d0c2e30786ea542df5c4755c2
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon May 6 14:28:56 2013 -0400

    -added models for questionnaire stuff

commit f98e246a4c2357fda2b904b97c01c713e2f3b2fc
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Fri May 3 11:35:08 2013 -0400

    -fixed typo in user model

commit 6f09a40d8c188120a4d584373056a515d94d9d80
Author: unknown <Jim Gummeson@OPTIPLEX360-64.techmission.local>
Date:   Mon Apr 22 16:51:17 2013 -0400

    -added associations for questionnaire stuff