Added an elephantbird option
Removed comment that made python imports fail