Removed swp files
Removed swp and ~ files
Merge branch 'master' into streaming

Conflicts:
	.Makefile.swp
	src/Main.cxx