Merge pull request #1 from emoncms/master

update from upstream
Merge remote-tracking branch 'upstream/master'
Correction

Fix to "fetch feeds" f04a357d18dc3e45c6821cead7f75c9a2457f5ff following
partial fix 9909a55d6ad5c924e2b15ad54fb4241f2b26a9e4 ref
https://github.com/emoncms/emoncms/pull/271. (was only returning a
single value, now returns all requested feed values as intended)
Merge pull request #272 from pb66/master_with_fetch_feeds

Master with fetch feeds