testing changes to master template
Merge branch 'master' of github.com:KennethWilke/salt-formula