Javascript snippets (vim, snipmate)
Merge branch master