Commit 6bd809b6b4836e1026998c2d4c1fc76506de3e8f Parent e5ab7bdbaa452d8bf7026875ee81fcb9c4a3c6d1 Author John MacFarlane <jgm@berkeley.edu> Date Mon, 24 Nov 2014 21:30:46 -0800 Merge pull request #219 from nwellnhof/editorconfig Fix .editorconfig