Removed pyaml requirement, use underlying yaml instead. yaml is compatible with older versions of python, pyaml is not
Fix yaml package name
Merge branch 'master' into reload