weirdness when I merged file.

stuff

commit message.
changes to gitignore
Merge branch 'master' of https://github.com/scaperot/media-setup-assistant

Needed to clean up a push I did in error.  somethings you don't want to share.