Set up so roughness can be horizontal or vertical
Merge branch 'master' of https://github.com/stealthysoto/ice

Conflicts:
	runws.py
	wstuff.py