Error handling and tests...
Added sbt plugin.
branch argument in PropsLoaderFactory.loadBranch was handled incorrectly.
== isn't !=
Merge remote-tracking branch 'upstream/master'

Conflicts:
	java/project/Build.scala
Plugins an dependencies update.
Versions everywhere!
Added ".branch" to branch String.
Hardcoded PropsLoader.branch to master.
Merge remote-tracking branch 'upstream/master' into php_props_loader
Props loader rewritten, some preliminary tests
Properties reader should be done now, needs testing
Composer and Monolog deps
Updated PHP PropsLoader code
Added PropsResolver, nested _ support.
Problems with full paths resolved, plus merge with upstream.
Instantor Plugin will preform a version check from now on.
Added recursive descent to sbt.bat
Added resolver cache in factory.
TotaLog bump.
php propsloader interface