Merge branch 'master' of https://github.com/jkitchin/org-ref
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Mon, 5 Jan 2015 19:40:31 +0000 (14:40 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Mon, 5 Jan 2015 19:40:31 +0000 (14:40 -0500)

Trivial merge