Kelp 1011

Ping @naturalist

I got kelp to launch properly, and manually added your changes from 1011. This is really close to being done, there are a few more validation issues. See the log [here](https://s3.amazonaws.com/archive.travis-ci.org/jobs/32773165/log.txt) (scroll to the bottom for the relevant bit)

If you would like, I will merge in this PR with my improvements, and then you can introduce a new PR to address the remaining validation problems