nyt bundle and stuff
Merge branch 'master' of https://github.com/Yserz/SocialDock.git