started adding graphing functionality
Merge remote-tracking branch 'upstream/master'
Added Di's correlation function manually; were having merge conflicts
Merge pull request #58 from lostorbit/master

merging di's changes