Merge pull request #357 from pleary/windshaft

Merging master into windshaft
Merge pull request #365 from pleary/windshaft

Recent updates to the windshaft branch
Merge pull request #396 from pleary/windshaft

Testing new windshaft additions
Allowing remote host for attachments