Rearranged some code
Changed eshell settings
Changed popwin settings
Merge remote-tracking branch 'origin/master'