Merge branch 'syntax-highlighting' into dev
authorDylan Lloyd <dylan@psu.edu>
Thu, 16 Jun 2011 19:42:57 +0000 (15:42 -0400)
committerDylan Lloyd <dylan@psu.edu>
Thu, 16 Jun 2011 19:42:57 +0000 (15:42 -0400)

Trivial merge