all test pass lint now
linted all simple things in server code
disabled linking on server grunt
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
Merge pull request #30 from amida-tech/linting-time

Linting time
async is missing from devdependencies
Merge branch 'linting-time'
cleaned up package.js
updated authors on packages