Clarify the README a bit.
Merge branch 'master' into angular