Refactor code

Refactor furthest current code
Add functions ...
Add vim options
Add .gitignore
Merge branch 'master' into nick_working

Conflicts:
	player.py