Merge pull request #138 from ucsflibtopfstedt/master

add combined primary key to table program_year_director
added fkey constraint to user table in db setup script. refs #3422
added  migration for setting a foreign key constraint on user::primary_school_id. refs #3422
bumped migration version number, refs #3422
Merge pull request #139 from ucsflibtopfstedt/feat3422

added fkey on user::primary_school_id