addign in bookmarket changes to view. This should not effect or be dependent on the version of sherd
Chipping away at json refactoring.
Refactoring out the base asset json rendering. Yay! One down - 4-5 to go.
* More json refactoring -- merged model based sherd_json functions into their respective TastyPie resource classes and eliminated.

* Resolved various selenium testing issues.
Merge branch 'taxonomy' of git.ccnmtl.columbia.edu:mediathread into develop