ucsf: update test for shuttle schedule
npm updates
Merge pull request #156 from Trott/updates

npm updates
Merge branch 'master' into karma

Conflicts:
	package.json