Remove geshi library becouse geshi module now has own .make
Merge branch 'dev'