Changes to command line parser
Merge branch 'master' of github.com:AaronGoldman/ccfs

Conflicts:
	src/parseFlags.go