Add prefernces to control beacon scanning intervals, completes #73
fixed merge conflict
Merge branch 'GeorgeHahn-AltBeaconScanInterval'