Updated command line tool. Spiked out rakefile