am 6ac858c6: am 30836aa9: am d379101d: Merge "Update docs to recommend Ubuntu 12.04 and OSX 10.8"

* commit '6ac858c6c38f31d43b65238f5834b791f1cb48d6':
  Update docs to recommend Ubuntu 12.04 and OSX 10.8