laptop merges

Changes taken from pre-git vimrc on laptop
Changes in comments
Added possible bundles to try (calendar)
added .gitignore