Merge pull request #5 from akadamson/analogAccel

Shuffled around the DMA Streams between the ADC functions and the sdCard...
20130604 - See readme.md
Merge remote-tracking branch 'origin/analogAccel' into analogAccel
Merge remote-tracking branch 'origin/analogAccel' into analogAccel
Merge remote-tracking branch 'origin/analogAccel' into analogAccel
Merge remote-tracking branch 'upstream/analogAccel' into analogAccel

Conflicts:
	src/calibration/accelCalibration.c
	src/cli.c
	src/main.c
	src/sensors/ms5611_I2C.c

merging in the latest upstream changes