allow 'includes' and 'translocates' to parse; refs #24
Merge branch 'experimental'
Merge branch 'experimental'
Merge branch 'experimental'
Merge branch 'master' into experimental