Integrating Amagavi fork of WOnder

Starting with this simple pull request but working through roughly 30 files in an attempt to merge Amagavi's fork of WOnder with the rest of the community.
Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>