Fix computeScrollerHeight() for window
Merge branch 'master' of github.com:ShiraNai7/jquery-scrollwatch

Conflicts:
	jquery.scrollwatch.min.js