Copied from ondeck
Merge branch 'master' of https://github.com/extrakt/mhacks-mixtape