Merge branch 'refs/heads/2.0'
Merge branch '2.1'
Cleanup and reset

Removal of past project styles. This happens because some updates to the theme come from projects as I build them. Not awesome I know. I'll do better to keep this all clean.

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Merge branch '2.1'
Update Hybrid Core: 2.0.3-beta-1

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Sub directory cleanup

I prefer inc to misc...

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Merge branch 'master' into 2.1