Changes to verification and screen clearing
Merge branch 'slingshot' of https://github.com/avivkiss/warp into slingshot

Conflicts:
	warp.py