Add clustering to google maps
Merge pull request #452 from gannetson/release/booking-temp

Add clustering to google maps
removed nose from setup.py
Merge branch 'release/booking-temp' of github.com:onepercentclub/bluebottle into release/booking-temp
Update setup.py
Update setup.py
Update .travis.yml
Merge pull request #458 from aethemba/1.0.4f

1.0.4f
merge xif setup.py
merge fix setup.py