undo-tree
ignore bookmarks
Merge branch 'master' into macbook