removing unused rake task
expanding ~ into full path
adding thor to create CLi
resolving conflicts