Expose conflicts (no fixing yet).
Improve url regex a bit.
Change text length to 160 for posts.
Merge remote-tracking branch 'ghubber/master'

Conflicts:
	src/cljs/link_collective/view.cljs