Merge branch 'master' of github.com:mapbox/mapbox-android-sdk

* Fixes #264
* Fixes #263
* Fixes #265
Merge branch 'master' of github.com:mapbox/mapbox-android-sdk