added testpy alias
made testpy and testpyvanilla aliases
Merge branch 'master' into laptop