add html file sync support
merge pull request https://github.com/VitaliyRodnenko/geeknote/pull/202
set default note editing extension with .org
Merge branch 'master' of https://github.com/ifree/geeknote

Conflicts:
	geeknote/config.py
	geeknote/editor.py
	geeknote/geeknote.py
	geeknote/gnsync.py