Add 2I term regexp feature from 1.4.4+ 

This targets the 2.0-stable branch and should be ported to master as well.

@evanmcc @javajolt @engelsanchez 

cc @martinsumner