Cleans up rc file and adds some support for ctrl p plus ag