Convert eclipsify to intellify
Pull in changes from nalexander/intellify