Initial commit
Merge https://github.com/lgraham/beans into trunk