Updated some stuff, I guess?

Not really sure what's happening here.
Fixing conflicts with this mystery merge.
Menus

Focus of this commit is adding the base menu navigation system. There
are other things being committed that I can't for the life of me
remember what they are.
Fixing shit.
Merge pull request #34 from rdurel423/master

Menu System