added marmalade and melpa, fixed some minor issues