Getting ready for master push
Merge branch 'dev' of https://github.com/wilblack/lilybot into dev