Merge pull request #18 from codefortulsa/master

Publish combine google/mapbox client
Merge pull request #19 from codefortulsa/master

Socket io events now trigger map events
prep for user locations
Merge branch 'gh-pages' of github.com:codefortulsa/open-search-map into gh-pages
:we:local gh-pages
add layer button and pop up
working layer add and delete
Merge branch 'gh-pages' of github.com:jdungan/open-search-map into gh-pages
catch up
change socket servers
mapbox less
socket server change
socket server change
fix panel close process
stacked icons not working in firefox, turning off mapbox
fix user location bounce crash
fix user location bounce crash
fix user location bounce crash
fix user location bounce crash again with event
fix user location bounce crash - give up on animation
fema demo cleanup
index change for merge