Merge pull request #14 from brain-murphy/brian-branch

Brian branch
fixed build errors
Merge branch 'master' of https://github.com/brain-murphy/autopilot into brian-branch