M-S-x fmarks.  fixed fmarks.  M-S-b bookmarks change
Merge branch 'master' of github.com:sagotsky/.dotfiles

Conflicts:
	scripts/fmarks.sh
border width -=1