massive cleanup sweep
add back the linkedin but w/o any ijod, just self
Merge branch 'master' into cleaner

Conflicts:
	lib/profileManager.js
Merge branch 'master' into cleaner

Conflicts:
	hallwayd.js
Merge branch 'master' into cleaner
add back in resources, we still use that in prod.
add back in /state, that's useful.
Merge branch 'master' into cleaner

Conflicts:
	test/lib/services/linkedin.test.js
Merge branch 'master' into cleaner

Conflicts:
	lib/services/smugmug/synclets.json
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner

Conflicts:
	lib/ijod.js
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner

Conflicts:
	hallwayd.js
	lib/acl.js
Merge branch 'master' into cleaner
Merge branch 'master' into cleaner
Merge pull request #882 from Singly/cleaner

Cleaner