added elevation data to display
Merge branch 'master' of https://github.com/PenguPilot/PenguPilot
updated srtl flight logic
Merge branch 'master' of https://github.com/PenguPilot/PenguPilot

Conflicts:
	elevmap/service/srtm.py
fixed matrix float conversion