update to use the latest version of ember app kit
clean up some merge conflicts