Adds support for changing the command-line
Merge branch 'vistrails-integration' into 'master'
Adds faq.rst