fix
Merge branch 'programming' into clojure

Conflicts:
	doc/key-bind.org
formating change
Ok.
Meh.
again
Merge branch 'clojure'

Conflicts:
	doc/key-bind.org
settings changes
fix whitespace
whitespace fix
formating changes
Merge branch 'general' into programming
configurations changes
Merge branch 'programming' into clojure
Configuration changes
Merge branch 'clojure'
Configuration and formating changes