Use codegangsta's cli package instead of flags
Updates, reorganize the code, clean everything up