Merge from master
Updated gitignore and removed test line from readme
Merge branch 'matt-local'