Added shift-indent functions.
Added default key for shift-indent.
Merged changes from remote.