Merge pull request #343 from simong/localhosttenant

#337 Renamed the 'signed' test tenant to 'localhost'
Removed performance folder
Merge pull request #347 from nicolaasmatthijs/issue346

Removed performance folder
Merge branch 'master' of http://github.com/sakaiproject/Hilary
Update README.md
Update README.md
Update README.md
Merge pull request #348 from bp323/readme

Update README.md
Increase wait times for tests.
Merge branch 'master' of http://github.com/sakaiproject/Hilary
Merge branch 'master' into activity-poc-agg2

Conflicts:
	node_modules/oae-search/lib/test/util.js