leaf report; rearrange

Ignore-this: 37ec3353cfd96fcaf3160a0a30cd769f

darcs-hash:20140420025342-312f9-a4a59260a324d7da58e9a28d72b271c7833f9582
layout

Ignore-this: 532349ccca4981bef0ccb5716303839c

darcs-hash:20140420030434-312f9-9f242493bd54bb0331af105bc4b52fa16551978b
make.py and other fixes

Ignore-this: db5491faac34a91e10018f14d8bd84ee

darcs-hash:20140420184905-312f9-db7b5dddd5cbe3708b1849c4289173360ff72e8b
package.json

Ignore-this: a9257ba7bfaba2b84d8d193c6cbed37

darcs-hash:20140420185129-312f9-2f6bba49fe6f5d00f8b54d1a417d3329e496bb02