Merge branch 'divinenephron-master-pr20'
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 22:13:53 +0000 (17:13 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 22:13:53 +0000 (17:13 -0500)

Trivial merge