Modified the vimrc, updated C++ templates and snippets. Updated Makefiles. Added new aliases.