cleaning up parser building
added shlex split to command line
Merge branch 'master' of https://github.com/jorge-ornelas/EncrypFS

Conflicts:
	lib/pyftpdlib-1.3.0/dist/pyftpdlib-1.3.0-py2.7.egg