Model doc 20140610
Merge branch 'mk_jpt4' of https://www.github.com/urbit/urbit.org into mk_jpt4