@@ -0,0 +1,31 @@
+" Used on directories that compile files individually (e.g. c.c -> c and cpp.cpp -> cpp)
+" <F5>: compile all
+" <F6>: compile and run the current file
+
+function! RedirStdoutNewTabSingle(cmd)
+	tabnext
+	if expand('%:p') != ""
+		tabprevious
+		execute "tabnew"
+		setlocal buftype=nofile
+		setlocal bufhidden=wipe
+		setlocal noswapfile
+	endif
+	%delete
+	execute "silent read !" . a:cmd
+	set nomodified
+endfunction
+
+function! MapAllBuff(keys, rhs)
+    exe 'noremap <buffer>' a:keys a:rhs
+    exe 'noremap! <buffer>' a:keys '<ESC>'.a:rhs
+endfunction
+
+call MapAllBuff( '<F5>'  , ':w<CR>:make<CR>' )
+if expand('%:e') =~ '\(c\|cpp\|f\)'
+	call MapAllBuff( '<F6>'  , ':call RedirStdoutNewTabSingle("make run=''\"' . expand('%:r')  . '\"''")<CR>' )
+	call MapAllBuff( '<F9>'  , ':call RedirStdoutNewTabSingle("make profile=''\"' . expand('%:r')  . '\"''")<CR>' )
+else
+	call MapAllBuff( '<F6>'  , ':call RedirStdoutNewTabSingle("make run")<CR>' )
+	call MapAllBuff( '<F9>'  , ':w<CR>:call RedirStdoutNewTabSingle("make profile")<CR>' )
+endif
@@ -46,8 +46,10 @@ IN_EXTS 	?= .c .cpp .f
 OUT_DIR 	?= _out/
 OUT_EXT 	?= #.elf
 
-# Basename without extension of file to run:
+# Basename without extension of file to run on run target.
 RUN ?= main
+# Allow users to write `make run=name`.
+run ?=
 
 ASSEMBLER_NOEXT		?= $(IN_DIR)$(RUN)
 DEBUG_DEFINE 		?=
@@ -70,6 +72,9 @@ OUTS		:= $(addprefix $(OUT_DIR), $(OUTS_NODIR))
 .PHONY: all asm set_asm_flags clean debug set_debug_flags help mkdir objdump set_objdump_flags profile set_profile_flags $(PHONY)
 
 all: mkdir $(OUTS)
+ifneq ($(strip $(run)),)
+	cd $(OUT_DIR) && ./"$(run)"
+endif
 
 $(OUT_DIR)%$(OUT_EXT): $(IN_DIR)%.c
 	$(MYCC) $(CFLAGS)    $(PROFILE_DEFINE) $(PROFILE_FLAGS) $(DEBUG_DEFINE) $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(INCLUDE_DIRS) -o "$@" "$<" $(LIBS)
 
@@ -9,7 +9,7 @@ To compile and run each directory on Ubuntu 12.04 do:
     make install-ubuntu
     make run
 
-You *must* run `make install-ubuntu` on the top-level before compiling any subdirectories.
+You *must* run `make install-ubuntu` on the top-level before compiling any subdirectories, as this will install basic tools such as recent enough `gcc` and `g++` for C11 and C++11.
 
 When there are multiple files compiled, e.g.:
 
@@ -18,8 +18,8 @@ When there are multiple files compiled, e.g.:
 
 run a given file by specifying the basename without extension:
 
-    make run RUN=c
-    make run RUN=cpp
+    make run=c
+    make run=cpp
 
 Doing just `make run` in those cases will run the default file.
 
 
@@ -7422,27 +7422,16 @@ int main(int argc, char **argv)
             shall only be cheated here once.
         */
         {
-            //create
+            // Create
             {
-                //empty
+                // Empty
                 {
                     std::vector<int> v;
-
-                    //NEW way in C++11
-                    //initializer lists
+                    //C++11 initializer lists:
                     std::vector<int> v1{};
-
                     assert(v == v1);
                 }
 
-                {
-                    typedef std::vector<int>::size_type IndexType;
-                    std::vector<IndexType> v;
-                    v = std::vector<IndexType>(5);
-                    v = std::vector<unsigned int>(4, 0);
-
-                }
-
                 /*
                 Fill constructor.