Merge branch 'master' of https://github.com/jkitchin/org-ref
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Thu, 25 Dec 2014 18:44:06 +0000 (13:44 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Thu, 25 Dec 2014 18:44:06 +0000 (13:44 -0500)

Trivial merge