Removing linkify_js. replaced with native django tempaltetag 'urlize'
Merge remote-tracking branch 'upstream/master'