CLOUDIFY-2012 fix blank lines
CLOUDIFY-2012 fix deps and travis files