EliAndrewC/magfest — pull request #208 by binary1230 (2014-05-24 13:52:58+00:00)
Title: magstock changes: config files, bugs, static_views, vagrant

-Update vagrant to ubuntu 14.04
- fix config file path bug
- redo existing magstock repository changes in a config file friendly way
- fix static_views not supporting directories
- fix static_views not serving the right content/type (templated CSS files weren't being recognized by browsers)
- first pass on themeing support, starting to apply it to the main prereg page to make swapping logos easier
- add a bunch of config variables

sidenote: I don't think commits to 'develop' branches need to be rebased. The 'develop' branch is our mainline branch, and commits to 'master' should be explicit merges on the tree (i.e. not fast forwarded) to signify new releases.

i.e. at the end of the day, our version history should look like most commits are happening linearly to develop, with occasional explicit merges into master when we do releases.

I'm new to that though so Eli if you think otherwise, we can talk.

Since the other pull request hasn't happened though, when I re-submit that, I'll rebase it on this one.