Merge pull request #1 from dberzano/master

elastiq and condor improvements for "elastic" CernVM clusters
adjust Makefile
adjust Makefile
user-data from file overrides base64 version

The user-data for elastiq workers can be given either inline, in the
context, as a single-line base64, or as an external file. The external
file has precedence and overrides the context variable.