Merge branch 'feature/loot-manipulation'

Committed this a little backwards which ended up with a merge conflict.
My bad. This should be all copacetic now.

[Fixes rapid7#1586]

Conflicts:
	lib/msf/ui/console/command_dispatcher/db.rb

Author: todb