Synchronizing all the changes getting the application running.   WE DIDN'T QUITE KNOW WHAT WE WERE DOING, so please look over the commit to make sure we didn't disable something important.