Make Sk.currLineNo the secondary source of line information, preferring line number information from the parameter to the constructor.
Merge branch 'master' of github.com:bnmnetp/skulpt

Conflicts:
	dist/skulpt.js
rebuild dist