Merge branch 'release/2.0'
Merge branch 'release/2.1'
Bumped version number to 2.1.1
Made tur resolvers recognize gas engines
Merge branch 'hotfix/2.1.1' into develop

Conflicts:
	setup.py