automation base re-vamped
Merge branch 'master' of https://github.com/stickymann/halaya