resolv conf
Merge branch 'ldrboard'
add in Joe's work refactoring
fix conflicts between ldrboard and master