Changed grunt file watch task to fit new folder structure
Connected upload module with encoding module
Hooked up encoder route to Encoder. Status of encoded videos restored
Removed some unused deps
Updated the encoding view to see the users filename not the uid