fixing soft links
Merge branch 'master' of github.com:giannic/dot

Conflicts:
	configure