Added editline and fix for running on OSX 10.9.x