Gh 337

also took care of watch mode, which was also removing the file extensions

See 0be6b23