Merge trello-49 into datadryad:dryad-dev

This PR is for testing trello-49 (current display-widget impl.) on dryad-dev server.

Merge of: rnathanday:trello-49 -> rnathanday:dryad-dev -> datadryad:dryad-dev. The rnathanday:dryad-dev branch was just rebased off of datadryad:dryad-dev (which was just rebased off of datadryad:dryad-master). Travis-ci just passed rnathanday:dryad-dev.