removed deprecated 'get_current_site_name'; implement #5 + more consistent code styling
removed all wpdb::escape calls
Merge branch 'feature/sunrise' into rewrite