Toned down pull request

Removed unstable effects. Includes angular changes. Server-simple.js for client testing.