Update from upstream

Incorporates all the changes from https://github.com/presidentbeef/brakeman/pull/492. 

/cc @mastahyeti @gregose