Merge master; fixed conflicts
Updating .gitignore; removing elpa catalog with archives from
repository; adding magit-status shortcut