Ed upgrade

Not sure what to do about the bower file, due to the bug in beta.12
Do you have time to add a test, and I can rebase?