Combined disparate method51 projects into one enormous beast.

The changes are as follows:

data resources have beel pulled out of the source structure of the project, i.e. they won't get bundled in the .jar when the project is built.
They now reside in the ./data folder. If you want to make the location of a file you use a parameter in the Props class, do so as normal, but don't provide a default value. Instead, the default value should be specified in a second class field with the `_default` suffix.

e.g.

@Parameter(whatever...)
public string myPath = "deafult/path/to/myPath";

now becomes

@Parameter(whatever...)
public string myPath;
public string myPath_default = "deafult/path/to/myPath";

You then access your path using props.getPath("myPath");

This scheme applies only when your file resides within the root data directory by default.

To illustrate using the above example, if props.dataDirectory.equals("data"), then props.getPath("myPath").equals("data/default/path/to/myPath");

In addition to this, the mlcl package has been moved to tag.method51 for all sources in this project (not dependencies).

I did my best to clean stuff up, but these changes may have residual bugs. If you're having trouble with something, feel free to ask me for help or punch me in the nose.

-dave
added .gitignore and deleted mis-indexed files
resolver conflicts
re-applied some small changes i forgot to commit before the big code move
added merge functionality for props
Merge branch 'master' of unix.uscs.susx.ac.uk:/its/research/calps/data3/mlcl/method51
Merge branch 'master' of unix:/its/research/calps/data3/mlcl/method51
Refactored props merge and default path stuff.

The changes to the default path stuff are as follows:
You no longer need to specify a separate _default variable.
Instead, just supply the default as usual, and use getPath("variableName") to get
you default path inside the root data directory. Or if the user has specified a
different path, it'll return that unmolested. Good times.
Merge branch 'master' of unix.uscs.susx.ac.uk:/its/research/calps/data3/mlcl/method51
added static fromString constructor
TorqBak handler, server, and subprocess handling refactor
renamed call to torqbak handler to something that exists
moved scripts and props to root dir
re-added tests
Merge branch 'master' of unix:/its/research/calps/data3/mlcl/method51
renamed locationfiltering package to conform with java convevtions
renamed locationfiltering package to conform with java convevtions
renamed locationfiltering package to conform with java convevtions
added get-data to database handler
small changes to make locationfilter work