Adding yasnippets and more...
Conflicts merged