I would suggest forcing a CLA on all contributions; like so: https://docs.google.com/spreadsheet/viewform?formkey=dGUwejFfbDhDYXR4bVFMRG1TUENqLWc6MQ
So you can relicense and change stuff later without huge problems with getting permission from all the contributors :).