Commit 423de04c79ec06f0bdfeb0d5087fbb88071a6b92 Parent 91910b094af8bedb08f612ec3e4036a25a748a0f Author John MacFarlane <jgm@berkeley.edu> Date Thu, 6 Nov 2014 23:36:49 -0800 Merge branch 'cmake' Conflicts: Makefile