Breaking it
Starting on PUT /surveys
Merge branch 'master' into update-survey
Update surveys
Emberize briefly
Merge branch 'master' into settings
handle updates to a survey
Remove old ember crutch
Moving towards settings
merge in master
Use cookie jar to manage several users
Merge conflict resolution; also adapt tests so to create/log in a user before running tests
Fix errant command
Fix wording on tests
Merge in master
Merge branch 'master' into settings

Conflicts:
	test/test.users.js
Merge pull request #12 from LocalData/settings

Allow survey updates
Merge branch 'master' into mongoose

Conflicts:
	test/test.slugs.js
	test/test.surveys.js