added processing to remove and restore colons from feature names
Merge branch 'devel' of github.com:joshua-decoder/joshua into devel