Added gitconfig and modified .gitignore
Upgraded packages
Re-enabled ido-mode
Added gitconfig and modified .gitignore
merged
Merge commit 'dc2b546'