...
Merge branch 'master' of bitbucket.org:kinbot/.emacs.d

Conflicts:
	javascript.el
dim-other-buffers
projectile
markdown-mode. twittering-mode