cleaning up the CLI and fixing duplicates problem again
Merge pull request #2 from table-stealers/michael-branch

cleaning up the CLI and fixing duplicates problem again
fixed conflict with erb updates