Fix indentation for case statements
Add wildcards to gitignore for extensions
Use sorted sets extension lists
Change elevator to 'elevator'

This would have made lots of people uhnappy.
Revert the revert of #3446

This reverts commit 9b35b0e13a7816cf7aea9d31d1cc36027e7718fc.

This should not land on master until the Metasploit Pro folks (@trosen-r7
and friends) get their Meterpreter path specifications working the
same way as Framework's does.
Merge #3476 into #3481 for meterpreter smilies

This incoporates @OJ's fixes as a result of gemification.
Merge upstream/master to deconflict.

Conflicts:
	Gemfile.lock
Update binaries
Land #3481, meterpreter bins
Land #3520 : Update Linux Meterpreter Binaries

Includes fixes for the sniffer which stop it breaking on x64 and make
it work with the `any` interface.

[FixRM #6355]