Prototype plot engine now pulls data from real-time feed
Merge branch 'master' of http://github.com/johngergely/conductor

merging changes from remote repo.