All done except documentation and tests
Everything appears to work, just some testing left
Documentation done, testing left
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud into sp3.sc2.$feature_streams_file

Conflicts:
	priv/dispatch.conf
Added test file and documentation for that test file
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud into sp3.sc2.$feature_streams_file
Should now be done
Changed include to not take path just file
New doc
Fixed comments from Gabriel
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud into sp3.sc2.$feature_streams_file

Conflicts:
	priv/dispatch.conf
	src/streams.erl
Fixed problem with tests
Merge pull request #34 from projectcs13/sp3.sc2.$feature_streams_file

Sp3.sc2.$feature streams file