Cleanup macro.vm and updated skype macro

The attached patch cleans up macro declarations in macros.vm so that they are consistently of the form:

#macro(macroname $param)

with no straneous spaces between syntax elements.

The skype macro is updated to use skype's presence service since the current version relies on a jyve.com service which has been discontinued. Skype's presence service only works for skype versions > 2.0 at the present time.