finished fixing tests and preparing build
Merge branch 'beta' of https://github.com/swansond/LavatoryLocator into beta