NOJIRA remove ncurses support
NOJIRA allow plugins to change calculated type
NOJIRA treat underscore names as comma delimited
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/models/ca_data_importers.php