add vagrant
Merge branch 'feature/20130427_vagrant' into develop