lots of changes and added .swp files to gitignore
Merge branch 'master' of github.com:nicolabe/appenings