Merge "Update docs to recommend Ubuntu 12.04 and OSX 10.8"