Rework media detection a bit (though this is still pretty ugly)
Hopefully give us better indication of when things break (and they do break)
Stylin' on y'all
Merge branch 'master' of github.com:bbenne10/statnot

Conflicts:
	statnot