Dec2014 docs edits

Please don't merge this yet! There are still a few more commits to get in.

When this is merged, please resolve the following tickets:

* DOC-1465
* DOC-1468
* DOC-1466