update .gitignore, remove some auto-generated files
merge with Dan
allow switching of views
Merge remote-tracking branch 'numberQ/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/TV_Tracker.java