Rewrote setup.sh to use functions
Modified discover.sh to clean up sub* files

sub1-4 were not being cleaned up after discover.sh completed.
Merge remote-tracking branch 'upstream/master' into dev
Merge remote-tracking branch 'upstream/master' into dev
Merge remote-tracking branch 'upstream/master' into dev
Modified discover.sh to change data storage

changed results storage from /$user to /$user/data
Merge pull request #16 from chrisbensch/dev

Land #16 @chrisbensch