add back google analytics, update wp to latest on github
update .htaccess with changes required from w3tc plugin
merge local and origin