Ohmage 2.16

merging in new 2.16 bugfixes to 2.16.1