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

Brian branch
Fixed defaultModel()
merge eric's changes
Merge branch 'master' of https://github.com/brain-murphy/autopilot into brian-branch