Merge branch 'migrations' of https://github.com/ucsflibtopfstedt/ilios
Merge branch 'master' of github.com:ilios/ilios
now throwing 404 error with filename when learning material is not found on the filesystem, refs #2775
phing -q too
keep pear quiet

Conflicts:

	.travis.yml
Merge pull request #75 from Trott/master

Travis setup steps quiet
Merge pull request #74 from thecoolestguy/bug2775

now throwing 404 error with filename when learning material is not found...