Adding python SimpleHTTPServer alias
Merge branch 'master' into nextgen-inheritance-upgrade