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

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