Commit 78ee7e81f59dc1e51551628f8f90ee58ea286cf8

Ben Straub 2014-02-05T14:10:19

More merge.conflictstyle fixes