Main module and main snippets for haskell
Import snippets for haskell
Update php snippets more for my needs
Merge github.com:MasseR/snipmate.vim

Conflicts:
	snippets/haskell.snippets
	snippets/php.snippets