Including test scripts
Merge branch 'master' into Test-Branch
Merge branch 'master' into Test-Branch

Conflicts:
	.gitignore
Merge branch 'master' into Test-Branch
Updating example files as well as adding new tests created by Barbara
Merge branch 'master' into Test-Branch
Merge branch 'master' into Test-Branch
Merge branch 'master' into Test-Branch
Renaming user specific directories. These should be renamed on the local coies of thsese files
Merge branch 'features' into Test-Branch
Improved portability of test cases
Finished improving test.xml so that R script files can be treated as universal templates. All files inside of /local are ignored, as well as all ddg folders created by scripts.
Adding additional test cases. Working on SivanSampling
Including expected output files for additional tests
Finished abstracting all test cases
Merged Barbara's updates from SVN repository
Finished improvements for tests
Excluding appropriate folders