clearing up many warnings, removing unnecessary regular expresion comparisons [#4365 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>