Development

Merge development branch. Includes readline hook machinery, better interface, updated documentation.