Clean App code
Updated Travis CI build file for OS X