misc
Merge branch 'master' of https://github.com/tracksun/file_mover

Conflicts:
	lib/file_mover.rb
added pgp_filter_test.rb
misc