Deleted some extra code from testing makefile
Merge branch 'master' of https://github.com/eshughes93/Smart-Irrigation-Project
Fixed template issue with DataStreams.

Moved the definition of the DataStream derived classes into the .h file.

Also added some preprocessors to SIP.ino