Change tes file names for consistency
removed tests, covered by tests in e2e and record directories
merged these two.  they were almost identical and differences were in
xit's.
getMerges gets patientId and more tests
Merge branch 'master' into afsin

Conflicts:
	server/lib/merge/index.js (patientKey added)
	server/lib/recordjs/merge.js (patientKey added)
	server/test/record/test-index.js (only xit, fixed in index.js)
Update README_record.md

Description of schemas started with storage.files
Update README_record.md

Patient data/metadata schemas explained.
Update README_record.md

Added merge history schema
Update README_record.md

Partial match collections described
Update README_record.md

Added updateAllergies example
Bug 196
Merge branch 'afsin' of https://github.com/amida-tech/DRE-UX.git into afsin
Merge branch 'master' into afsin
Merge branch 'master' into afsin
all test pass lint now
linted all simple things in server code
disabled linking on server grunt
Merge branch 'master' into afsin
Merge pull request #27 from amida-tech/afsin

Should we merge Afsin's branch to master??
Merge branch 'master' into linting-time

Conflicts:
	server/package.json
	server/test/record/test-merge.js
	server/test/record/test-partial.js
	server/test/unit/merge.js
	server/test/unit/storage.js