wip
Merge branch 'move_htlinks_into_models' of github.com:alienlike/hypertextual into move_htlinks_into_models

Conflicts:
	hypertextual/models/link.py