added ignore
test changes
Merge pull request #1 from JohnAllsopp/master

Add some stuff