Fixed makefile and gitignore.
Merge branch 'work' of github.com:holodnak/nesemu2 into work

Conflicts:
	make/sources.make
Merge branch 'work' of github.com:holodnak/nesemu2 into work
Changed visual studio project files to remove old defines.