Updated version to 2.0

Code now meets PEP8 code style guidelines.
Fixed issue with __get_mac_address function on Android.
Merged in changes from diegofn.
General tidy up.