Allowed for multiple datapoints on widget graphs.

Fixed the duplicate assignment of class requirements.
Merge branch 'master' of github.com:jamesread/upsilon