Removed commented temp code
Merge commit 'c2f684c823fceb1fabde6a6d34cf6bd99ba4062d'
GeoIP inclusion in homepage