Disable standalone in vsftpd if using xinetd (bnc#897470)
Unit test renamed to class name (Yast convention)
Version and changelog updates
Merge pull request #12 from ancorgs/vs_standalone

Disable standalone in vsftpd if using xinetd (bnc#897470)
proper maintenance target
addded .travis.yml
Merge branch 'SLE-12-GA' into vs_standalone_master

Conflicts:
	.travis.yml
	Rakefile
Merge pull request #14 from ancorgs/vs_standalone_master

Merge version 3.1.6 into master