astyle: Update libastyle copy to 2.04
astyle: Remove dead code
astyle: Turn defines into constants
astyle: Apply patch to detect custom keywords

Will be part of libastyle 2.05

Courtesy of David Faure, also see
http://sourceforge.net/p/astyle/bugs/154/
Include testhelpers.h to get pretty-printers