Updated license.txt to reflect AMIDST's license.
Merge branch 'master' into new-features