Ignore eshell/
Configure indentation.
Merge branch 'develop'