Removed apostrophe.el.
How did that ever work?
Removed jdee, added marmalade to elpa's package-list and switched to elpa for haskell-mode.
Moved markdown and undo-tree to elpa