Update from win8 vm
merge changes from vm
Merge remote-tracking branch 'origin/master'

Conflicts:
	Functional-Data-Structures/Script.fsx