Merge branch 'release/2.1' into develop

- Bumped version number to 2.2dev.
Bug fix for writing emission grids, minor reformatting of subdb.py
Renamed shipDefaults.py to extend_template_edb.py
Removed unittest from the compat module

- Unittest2 is only guaranteed to be available during testing.
Merge branch 'hotfix/2.1.1' into develop

Conflicts:
	setup.py
Fixed set_sfoc_base callback of IHS lookupservice to convert unit
Removed the EM_HFC getter from the tur resolvers
Removed ae_count and me_count getters from TUR2013 and TUR2014 resolvers
Resolvers can now raise ResolutionError if a source can't be resolved
Fixed shipEmisTs

The shipEmisTs tool was in some state of limbo between pyAirviro
before 2.0 and after.  This confused both me and David.  This commit
should fix it.  NOTE however that the formula parser still doesn't
handle unary minus.
Updated shipEmisTs for the TUR resolvers
Merge branch 'topic/shipEmisTs' into develop
Limited accepted values of engine power in the TUR2013/14 resolvers
Made tur resolvers set ae_power_mcr to 0 if ship has electric gear
Made tur resolvers' classifiers raise ResolutionError instead of ValueError
Fixed a bug with data_expiration set to 0 in lookupservices
Added a clean ALOB option to lookupservices
Removed update of ae_sfoc_base from set_sfoc_base() of ihs service

- Furthermore, the value of me_sfoc_base is now discarded if it is
  below 100 g/kWh.
Simplified calculations of engine usage parameters in tur resolvers
Removed tur resolvers' speed_mcr getter