Point Berksfile to master branches
Start migration towards tag based searches

- Add tags to different server types (management, proxy, object, etc)
- Change ntp search to look for management-server tag instead of role
Update keystone reference after nova attr change
Merge pull request #33 from claco/search-using-tags

Merged automatically by jenkins after successful build test