Updates for building in VC2015
Merge branch 'glNext' of github.com:cinder/Cinder into glNext