Master with fetch feeds

Reapplied changes following chaveiro's fix being merged. ref https://github.com/emoncms/emoncms/pull/271