Merging my fork of txtalert back info praekelt/txtalert

It's about time.