Merge pull request #45 from eonarheim/dev-erik

Merging in recent development into master
Merge branch 'dev-erik' of https://github.com/eonarheim/Excalibur into dev-erik
Fix #53 change build artifacts to Excalibur