Remove conflicted copy
Merge branch 'dev' of github.com:dhadfieldmenell/lfd into dev
Minor import fix