Merge branch 'lxc' into docs
Add arg passing to wrapper funcs from top level
Add initial state wfunc module
ps: tweak docstrings
fix bad ref to the minion's opts
silly pylint fix
Merge pull request #7010 from mgwilliams/docs

tweak docstrings
Merge branch 'develop' into lxc