More useful and prettier default help message.
Merge remote branch 'origin/master'
Cleaner relaxation parameter inclusion.

Also some minor reformatting.