Removing manateeworks from master.. (duh)
Putting js back