updating with ch 4 stuff
Merge branch 'master' of https://github.com/dfarquharson/byol

not sure what I just pulled
comment about arch