Updating demo project for new include paths
* Cleaning up user agent string creation