Improvements
Merge branch 'master' of https://github.com/Belgarion/sputnik
Only use network data if its newer than local