add .swp files to .gitignore
Merge branch 'orm' of https://github.com/hall5714/Freedom-Galaxy into orm
Made changes to combat.py
Update .travis.yml

Remove Python 3
Change python version
Flight to Egrix completed, ready for any modifications.
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy into orm

Conflicts:
	fitg/backend/actions/combat.py
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy into orm
Military combat changes
Some Changes to mil combat
fixing conflicts
Merge branch 'orm'
By request, races.yaml is completed.
Egrix.yaml edited, races deleted from scenario as that is redundent with races.yaml in existance.
Merged Orm into single file, server and test_client currently working
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
merge orm/api
fixed game local/remote mismatch
fix orm descrepency
rmoving actiosn orm adding changes to test_client/service