crunch time
Merge branch 'master' of https://github.com/jnhall/vsh

Conflicts:
	lex.yy.o
	vsh.exe
	vsh.o
	y.tab.c
	y.tab.o