Merge branch 'master' of heroku.com:iinstincts
moved scroll plugin initialization to js file