Refactored license stuff (refs #96)
Testing (fixes #96)