Merge pull request #138 from alexander-zimmermann/next

No leading underscore for names
Merge pull request #140 from alexander-zimmermann/next

Update travis config
Added copy function to arg parser.

Now the option struct is copied on initialization, making the argparser independent.
In controller: Made arg parser global (again).
Merge pull request #142 from erzb5e6f65/MakeArgParserIndependent

Make arg parser independent
Merge remote-tracking branch 'upstream/next' into next

Conflicts:
	src/flowgrind.c