Merged branch devel into master.
Ignore Vim swap files.
Ignore Python bytecode files.
Merge branch 'devel'
Merge branch 'master' into devel

Conflicts:
	.gitignore