Argparse: use filetype
Cleanup imports, use java 7 style diamond inference, removed deprecated javadoc