Sync travis setup with current Makefile.
Fix jstests.
Taking jstest out of Travis for now; #1981
Merge pull request #1981 from gittip/fix-travis

Sync travis setup with current Makefile.
Merge branch 'master' into repair-twitter