try non-fuzzy prior fuzzy mac matching

Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
Merge pull request #26 from T-X/for-upstream

try non-fuzzy prior fuzzy mac matching
alfred: use network.mac as ID if present
bugs
Add uptime to nodes
FFHH specific changes
Fix iteration over nodes
Merge branch 'master' of github.com:ffnord/ffmap-backend

Conflicts:
	.gitignore
	alfred.py
	nodedb.py