3.0 update

Updated to work with latest Aviary SDK and Titanium 3.0