Merged in some client code changes as per Speedy1985
Merged in some device code changes as per Speedy1985
Modified .gitignore