Merge branch 'vs2013_3' of https://github.com/xchrdw/Selene

Conflicts:
	test/selector_tests.h