Merge pull request #472 from myndzi/jshint-ignore-migrations

Don't lint leftover migration files from interrupted tests
Fix SQLite composite primary key
Merge pull request #485 from fluxxu/master

* fluxxu-master:
  Fix SQLite composite primary key
Merge remote branch 'upstream/master'