merge mysterious conflicts with my own commit?
move travis CI img to bottom of readme
ignore xcode UI state files
modify sconstruct to fix travis CI builds