#241 comment: Add wifi and teahouse syns
Merge branch 'master' of https://github.com/mrdummy/solrconf