Minor adjustments
Merge remote-tracking branch 'remotes/upstream/master'
Remove unnecessary files
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	run.n
	tools/run-script/src/RunScript.hx
Define "nme" so conditional code will work as expected (temporary?)
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	include.nmml
Merge branch 'master' of github.com:haxenme/NME

Conflicts:
	.travis.yml
	browser/display/BitmapData.hx
	browser/geom/Vector3D.hx
Merge branch 'master' of github.com:haxenme/NME

Conflicts:
	project/Build.xml
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME