Remove pre-EAK stuff
Merge branch 'ember' into travis