Switch to ELPA for yasnippet and magit, minor modifications to custom color themes