Updated to Bootstrap 2.3.0
Removed readline dependency
Removed readline dependency
fixed merge conflict