Merge 2.0 into master

I am merging 2.0 to master in order to have the latest documentation (including information about 1.x and 2.x differences) available on apidocs.strongloop.com.

/cc @ritch