Temporary commit of popover stuff to merge.
Merge branch 'master' of https://github.com/kisonecat/ximera
Merging; fixed expression-answer.