updated javascript
Merge branch 'master' into chelsea
clean up stuff in views and blah blah