Improved organization of vimrc - added default @p prototype macro.