Cleaned this up a wee bit
Merge branch 'master' of github.com:mskog/medialair