Reflect build status of master in README badge, add but about testing…

… setup

README.md

@@ -1,4 +1,4 @@
-## ANXS - nodejs [![Build Status](https://travis-ci.org/ANXS/nodejs.png)](https://travis-ci.org/ANXS/nodejs)
+## ANXS - nodejs [![Build Status](https://travis-ci.org/ANXS/nodejs.png?branch=master)](https://travis-ci.org/ANXS/nodejs)
 
 Ansible role for installing nodejs, from package or by building it from source.
 
@@ -21,6 +21,17 @@ nodejs_version: "0.11.13"           # nodejs version to install.
 nodejs_install_method: "binary"     # "source" or "binary" (package is not available for 0.11)
 ```
 
+#### Testing
+This project comes with a Vagrantfile, this is a fast and easy way to test changes to the role, fire it up with `vagrant up`
+
+See [vagrant docs](https://docs.vagrantup.com/v2/) for getting setup with vagrant
+
+Once your VM is up, you can reprovision it using either `vagrant provision`, or `ansible-playbook tests/playbook.yml -i vagrant-inventory`
+
+If you want to toy with the test play, see [tests/playbook.yml](./tests/playbook.yml), and change the variables in [tests/vars.yml](./tests/vars.yml)
+
+If you are contributing, please first test your changes within the vagrant environment, (using the targeted distribution), and if possible, ensure your change is covered in the tests found in [.travis.yml](./.travis.yml)
+
 #### Thanks to
 - [Nicolas Bazire](https://github.com/nicbaz)
 - [Luís Couto](https://github.com/Couto)

ansible.cfg

@@ -1,6 +1,2 @@
 [defaults]
-<<<<<<< f1c92d4cc19c8c520b8f133992f224dacf43af2a
-roles_path = ~/roles/
-=======
 roles_path = ../
->>>>>>> Swithc to role based testing, bump node to 0.10.44, use ansible facts rather than shell