Merge pull request #52 from Gillingham/develop

Update to celery 3.1.x and Show partially trained skills in the skillplan
Merge pull request #53 from Gillingham/develop

Add the % done to the current training skill in the skillplan
Merge pull request #55 from Gillingham/develop

Swap README over to use markdown
Merge pull request #56 from Gillingham/develop

flake8 style/formatting changes and migration away from get_profile()
Merge pull request #60 from Gillingham/develop

Migrate to bootstrap 3.1.1
Merge pull request #62 from Gillingham/develop

Update bootswatch themes to match the bootstrap2.x versions a bit more
Merge pull request #63 from Gillingham/develop

Add a FixContracts periodic task to fix expired but unfinished contracts
Merge pull request #64 from Gillingham/develop

Undo regression that broke wallet aggregation, small CSS changes to character page
Merge pull request #65 from Gillingham/develop

Fix FixContracts
Merge pull request #66 from Gillingham/develop

Fix some more theme issues
Merge pull request #67 from Gillingham/develop

Fix editing of APIKey name/groupname on account page. Fixes #57
Merge pull request #68 from Gillingham/develop

Make the default bootstrap theme include the bootstrap non-flat theme
Merge pull request #75 from Gillingham/develop

Update to bootstrap 3.2.0
Merge pull request #77 from Gillingham/develop

Add PI stuff
Merge pull request #78 from Gillingham/develop

Fix removing of old planetary colonies/pins
Merge pull request #81 from Gillingham/develop

Augh Industry Changes
Update industryjobs.py

Fix typo
Merge pull request #6 from madcowfred/develop

.