Prepare modulefile for 1st. time module upload
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/example42/puppet-vsftpd

Conflicts:
	Modulefile
Fix template error
Merge pull request #5 from netmanagers/master

Fix template error