fix conflict after pulling dev version over unsaved changes on laptop conf. Run preliminary tests on Yosemite