changes clustering drawable for better visibility
adds gen dir to gitignore
alters condition in canvas drawing to allow count numbers to be drawn as well
Merge branch 'master' of github.com:mapbox/mapbox-android-sdk