Merge branch 'cleanup'
Add custom mod_remoteip to deal with proxied IPs
Merge branch 'master' into staging