Update Master to 2.5

2.4 Release

Updated changelog

Merge branch 'master' of https://github.com/EmpireProject/Empire

Initial commit of Empire 2.1

Merge branch 'dev'

README Update

correct conflict in changelog

Merge pull request EmpireProject#121 from PowerShellEmpire/dev

Empire 1.4 release.

Updated version number and changelog for 1.3.1

Merge pull request EmpireProject#74 from pasv/module_dev_paranoia

Invoke-Paranoia