Add the recentactivity suite
Merge pull request #24 from bp323/master

NOJIRA Finish the implementation of the feeds
Discovery
Merge pull request #23 from christianv/master

Add the recentactivity suite
Fix id
NOJIRA - Fixes for large batches
Merge branch 'master' of github.com:sakaiproject/OAE-model-loader

* 'master' of github.com:sakaiproject/OAE-model-loader:
  Discovery
  NOJIRA Finish implementation of feeds
  Add the recentactivity suite
NOJIRA - Fixing discovery suite
Cleaned up jshint errors
Merge remote-tracking branch 'sakaiproject/master'
NOJIRA - update the README.md file
NOJIRA - Making concurrent batch loading possible
Merge pull request #25 from christianv/master

Fix id
Merge branch 'jshint' of git://github.com/stuartf/OAE-model-loader into jshint

* 'jshint' of git://github.com/stuartf/OAE-model-loader:
  Cleaned up jshint errors

Conflicts:
	loaddata.js
(NOJIRA) Clean trailing slashes at the end of the server url
NOJIRA Adding support for generating and packaging performance test input data.

Added new npm modules:

optimist (command-line option handling)
mkdirp (mkdir -p)
moment (date-time formatting)
ncp (cp -r)

Added performance-testing directory that provides a script (package.js) that can be used to:

* Create a set of CSV files that will feed into performance tests
* Copy a snapshot of the model-builder data scripts that were used to generate the CSV data so they can be re-used sometime

Adding optimist functionality into loaddata.js and generate.js for an easier-to-use command line.

Added the ability to start a data-load job from a particular batch. Useful for being able to incremental loading jobs.
Adding README.md for performance-testing directory.
Fix MD in performance README
Merge pull request #27 from mrvisser/no-trailing-slash

(NOJIRA) Clean trailing slashes at the end of the server url
NOJIRA - Replace deprecated server creation in main.js