PoPs' requests on wiki formatting
Use Rakefile to establish Git info
Merge branch 'master' of git.stratosphe.re:reddit/teslore into develop
Merge branch 'develop'
Merge branch 'develop'
Flair update. REQUIRES IMAGE REUPLOAD WITH BUILD or flairs will get shifted.
Merge branch 'master' of github.com:myrrlyn/teslore into develop

oooookaaaayyyyyy
Merge branch 'develop'

merging is hard
Merge remote-tracking branch 'origin/master'

what even happened here...