move id mapping into base preprocessor
update versions to ruby 2.1
Merge branch 'master' into generalization

Conflicts:
	.travis.yml
	.versions.conf