Remove phantomJSWorkarounds
Merge pull request #267 from rcchan/remove-workarounds

Remove phantomJSWorkarounds
pep8 1.4.6 indentation fixes
Merge pull request #268 from rcchan/master

pep8 1.4.6 indentation fixes
Quota number of collections per res_id
Factor out setUp/tearDown for quota collections tests
Use None for no quota in config
Merge pull request #260 from rcchan/collection-limit

Quota number of collections per res_id
Merge branch 'master' of git://github.com/10gen-labs/mongo-web-shell into license

Conflicts:
	frontend/spec/phantomJSWorkarounds.js