Updates due to moving to Eclipse Luna (i know, Eclipse files shouldn't
even be in CM!)