add stff
Merge branch 'master' of github.com:ivanhanigan/disentangle

Conflicts:
	R/oldnode2orgmode.r
	tests/test-oldnode2orgmode.r