Fixes some issues brought up from landscape.io
Merge branch 'master' of github.com:softlayer/swftp