Everything done and tested, save the server and the push
-a doesn't add rewritten directories, go figure
Merge pull request #1 from mcjimenez/master

Tested everything on desktop, and without the server side