Add vagrant, 5.4 support

This pr fixes #1, #2.