Fixed auto indent on paste when pasting over a selection.
Merge pull request #163 from TheKiteEatingTree/autoIndentFix

Fixed auto indent on paste when pasting over a selection
Updated changelog and bumped version number
Merge branch 'master' of github.com:zedapp/zed
Apply master patch manually
Merge remote-tracking branch 'origin/master' into architect

Conflicts:
	app/config/all
	app/js/editor.js