More DRY spec and updated gitignore
Merge branch 'futhr'