specs into correct files

Conflicts:
	tests/jasmine/spec/ilios_base.spec.js
Merge pull request #469 from Trott/specs-refactor

specs into correct files