OAuth stuff works now. fixed #83
saves github username to profile
Merge branch 'hotfix/oauth' into dev
Merge branch 'dev' of ssh://personal/codeflash/codeflash into dev
Delete database.yml so we can gitignore it
Ignore database config
Altered travis' database.yml
Merge branch 'feature/test' into dev
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev

Conflicts:
	config/database.yml
Repaired the database yml files. Cause thenickperson done goofed.
Merge branch 'dev' into feature/ace