Fix uncommented line
Simplify, using default 'snippets' dir
Don't know what this was for, remove
Load packages we want from ELPA/Marmalade

Don't use MELPA yet, may be too bleeding edge
Move my snippets to where YAS looks for them