README update
annotations in embeds
Merge branch 'rails3' of github.com:jywarren/mapknitter into rails3