latest changes on meetspike
Merge branch 'master' of https://github.com/davevangoor/dotfiles