fix bug, MaxMind/GeoIP/geoip.inc should refer to base lib directory
Merge branch 'master' of https://github.com/yssource/magento-onepagecheckout
 last commit message is incorrectly, ready to re commit again