Update from upstream

incorporates all the changes from https://github.com/presidentbeef/brakeman/pull/492.  It is kind of nice having the number of methods being scanned in `user.rb` go from 5 to 520 (no joke) :smile:

/cc @gregose @mastahyeti