Merge rolling upgrade note
Merge branch 'er-intro-tweaks' of github.com:basho/basho_docs into er-intro-tweaks