Merge pull request #37 from jeffreymyers/master

Updated location of jquery
Migration script to add database constraints to conqueso tables
Merge remote-tracking branch 'upstream/master'