removing blanca db config
Merge branch 'rails-dashboard' of github.com:unepwcmc/unep-wcmc.org into rails-dashboard
Merge branch 'rails-dashboard' of github.com:unepwcmc/unep-wcmc.org into rails-dashboard
when no geoip is found default to gb
Merge branch 'rails-dashboard' of github.com:unepwcmc/unep-wcmc.org into rails-dashboard

Conflicts:
	config/database.yml