Add preliminary org, org-capture conf
Merge remote-tracking branch 'origin/master'