Simplfied input mechanisms
Added dual stick controls. Happy Travis?
Merge branch 'master' into initial_demo_merge using --strategy=ours to
ignore all changes from master.  This is in preparation for "moving" the
master branch to this branch.