Fixed another merge problem.
Merge branch 'master' of github.com:ccopper/InstantVis