Merge pull request #302 from cpoulain/master

Update setup script for Windows
Remove old bundle models and views. Add first-cut integration with bundle service.