Windshaft

This is just the result of merging the master into windshaft, and moving two javascript files into the right place now that we're using the asset pipeline