fixed filter order, added timeline enhancements
Merge branch 'master' of https://github.com/jogloran/govhack