Updated readme so that changes can be made upstream, and merged downstream without conflicts.
Merge branch 'master' into portfolio-2014-05