changed org file and date format to my preferences

file format now uses the .org extension
date format now uses the ISO format

Conflicts:
	emacs