Merge pull request #13 from adamreis/samara

Pipers no longer go for same rat
fixed java 1.6 error and took out trying to stop pipers going for same rat