Removed unused variables
Fixup arg parsing
Merge branch 'for-fluffy' of git://vault24.org/~nuxi/disconet

Forgot breaks, adding help message