Add command line option 'Max line length', defaults to 80 chars.
Update .gitignore
Merge branch 'pr/5'

Conflicts:
	.gitignore
Update gitignore again