Merge pull request #28 from browndav/dev

Directory reorganization merge
Merge pull request #29 from browndav/dev

Merge development to master
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge pull request #30 from browndav/dev

Merge branch 'dev' in to 'master'
Don't use readlink to absolutize a not-yet-existent path.
Restore missing `@` prefix.
Merge branch 'dev' of https://github.com/browndav/medic-os

Conflicts:
	platform/source/Makefile
Fix merge conflict.
Add underscore.js, simplify poll method, add `handler` property.
Minor simplification.
Merge branch 'dev' of https://github.com/browndav/medic-os into concierge-refactor