Dec2014 docs edits

This is ready to merge now. 

When this is merged, please resolve the following tickets:

* DOC-1465
* DOC-1468