checkpoint 20131123 lots of updates: using melpa instead of marmalade; fixing cider