D3 work

Pulled changes from master and fixed merge conflicts. This request includes models and d3 files.