regex for word filtering
make block placement more explicit
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop