Updating gitingnore and gitattributes. Updating manifest to the way
android apparently likes it now.