Cleaned up url conf + fixed regex youtube shortened
Merge branch 'master' of https://github.com/jptr/HipMeBeta2