Make return pluging and arg as key instead only plugin
Merge branch 'develop' of https://github.com/topochan/salt into develop