Move documents folder

Add it, and update gitignore
Merge branch 'settings'. More gitignore magic from Ben

Conflicts:
	.gitignore