Added Buzzword recognition
Merge branch 'master' of https://github.com/xangell/aHome.git