Merge pull request #1 from NyxStudios/general-devel

Pulling commits from TShock
More of & -> &&

I. Am. Dumb.