closes #579 - adding a readme to the content/data folder to make sure it is always created - also fixes a rebasing error