Adding in Brad's commits here

Adding in some commits Brad made to master so I can make my merging life
easier.

#1 Changes for checking target of td click so links don't trigger
expand/collapse
#2 Updates to demo2.htm to include links