am d379101d: Merge "Update docs to recommend Ubuntu 12.04 and OSX 10.8"

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