removed gplume external dependency; add LIRS cache
resolve conflicts