XML exports of filename should show real filename not one on filesystem,
export_options should support IS_LOCATION
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3/s3xml.py
Remove redundant check.