Ignore projectile-bookmarks.eld
Fix docstring
bookmark
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.gitignore