change keys toctrl-o and p due to weird bug with ctrl-[
Merge branch 'master' of https://github.com/Tox/toxic
didnt mean to change that