Merge pull request #1 from curoverse/master
authorJoshua C. Randall <jcrandall@alum.mit.edu>
Mon, 23 Mar 2015 17:50:49 +0000 (17:50 +0000)
committerJoshua C. Randall <jcrandall@alum.mit.edu>
Mon, 23 Mar 2015 17:50:49 +0000 (17:50 +0000)
pulling from upstream


Trivial merge