make js indent to 4 spaces
clean up zshrc
Merge branch 'master' of github.com:linmic/rcs
merged changes