implemented list display
resolved conflicts, re-added list display features
edited grunt file
Merge pull request #34 from FlappyMappy/zach2

Zach. UI updates. Gruntfile Update. Add list view to right column.