Updated Rakefile again

Added some comments to make the code clearer
Removed the :publish task and renamed :publish2 as :publish
Change the new :publish task to use the full path for the main site and specified the Rakefile
to use when trying to deploy the main site (I still don't know it this will work though
:frowning:)
Reorganised some of the other tasks for no really good reason other than that I wanted to