Always grab locks
Get jabber working
formatting
Add advice for indenting to also align comments
factor scratch-persist and occur-default-current-word into marmalade packages
Add org-bullets recipe and remove it from external directory
delete tmp
Remove some useless js2 settings and relocate the rest