Rearrange navbar links to match our mockups
Use Gravatar for pretty navbar profile links
Move profile link to the left of achievements
Merge branch 'dev' into feature/ui
Merge pull request #84 from codeflash/dev

Dev to feature/ui
Changed navbar to match mockups.
Added avatar mask, altered padding on right side.
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
Merge branch 'master' into feature/ui
Merge branch 'feature/ui' of https://github.com/codeflash/codeflash into feature/ui
Repaired the database yml files. Cause thenickperson done goofed.
Merge branch 'dev' into feature/ui
Merge branch 'feature/ui' into dev