added control p plugin
Merge branch 'control-p' into tabsindent