rm keys
Merge branch 'master' of https://github.com/jbalkman/rayvid

Conflicts:
	mainapp.py
rmvd keys