Background refinements. Fixes #561, fixes #456
Merge branch 'master' of github.com:systemed/iD