Update README.md to latest from master
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04