Merge branch 'stacklight' of github.com:tcpcloud/salt-formula-heka into stacklight