Some ibus stuff
Upstream keyboard plugin
Add ibus dependency
ibus fixes
ibus fixes
Couple fixes