Added epub format
custom.el is a personal setting
Upstream org changes