rebase
Merge branch 'master' of https://github.com/epinna/Weevely

* 'master' of https://github.com/epinna/Weevely: (37 commits)
  Fixed wrong exit and help prints
  Fixed user agent randomization
  Minor audit.systemfiles fix
  Deleted test files
  Deleted test files
  Testsuite: add file.touch
  Testsuite: add file.edit -keep-ts tests
  Fixed file.edit error while keep-ts on new files
  Ignoring .gitattributes and .gitignore on git archive
  Ignoring .gitattributes and .gitignore on git archive
  Add .gitattributes to simplify git archive distribution
  Fixed oldest timestamp find in :file.touch
  Fixed :file.touch time string parse
  Upgraded version to 1.1
  Fixed sql modules parameters and default account fallback handling
  Upgraded to v 1.02
  Added file.edit -keep-ts option to keep timestamp unchanged
  Added file.touch -epoch option
  Minor fixes
  Add -oldest option to file.touch
  ...

Conflicts:
	modules/file/upload.py
	modules/shell/php.py
Revert "rebase"

This reverts commit 2e593bebcff5a3e7ec7ad5d2006dc8d2ea7ffb0e.