Bumped version number to 2.1
Removed the TUR2013 and TURBETA pyAirviro.resolvers entry points
Merge branch 'release/2.1' into develop

- Bumped version number to 2.2dev.