Added gitignore to skip temporary *.swp files
more readme updates
Merge branch 'master' into test_branch_to_merge

Conflicts:
	README.md
Merge branch 'test_branch_to_merge'