added .gitignore
Added meister´s changes to Makefile
Merge branch 'master' of https://github.com/slashphotos/harakiri into robexperimental

Conflicts:
	Makefile
Roberto´s latest changes: " !!! Just some code to look at !!!
Finally Sonar is done. At least i consider it done. The spikes eliminated by rewriting sonar interrupt. Reworked Maxbotix support. Implemented detection and correction of user/configuration - errors. This sonar code is a very solid basis now and will blend into your baro acc/fusion. Reduce the autolandrate, because with sonarcontact it will do a controlled but perhaps too quick landing. Feel free to use that for perhaps further dev-work. Look in config.c for further details. For me it's done and will proceed with GPS functions and look at meisters great mavlink implementation!"
Roberto´s latest changes: "** Warning! I could produce an alarmstart in althold start - LOL really surprised me - fixed in next version - coming today ***
Hi! This Version is partly tested and should not kill you. So Hex included. A lot of changes and improvements. Please look in config.c for details."
Roberto´s latest changes: "Partly tested.
Hopefully alarmstartbug fixed (anyway, i couldn't reproduce it. :)..)
My crappy RC had too less deadband so PH didn't actually lock in. Separate PH deadband in the works.
Like always careful testing!"