Navy and Vineyard spelling, try 2
Merge pull request #5 from timeril/master

vineyard spelling and navy - try 2