Cleanup space mistakes before doing changes

There was some space mismatch. I cleaned them up before doing the real
work.
Adding a way to configure NAT settings

Often there is the need to configure PassivePorts and MasqueradeAddress
to let the ftp server work properly through to a NAT or load balancing
system like F5. Also on vitalisation environments, this setting is often
needed as the machine cannot see the public addresses.
Deleting left over swp file

Never ever add vim swap file to a repo.
Allow to configure the template to use

There might be situations where there is a need to even completely
replace the template without modifying the module installed by puppet
module.
Missing "f" :-)
Forgott one place to set this stuff
Grml, he forgot one parameter
Merge branch 'master' of https://github.com/mowgli/adamjlow-proftpd

Conflicts:
	manifests/params.pp