355 commits

Author	SHA1	Message	Date
Zach Brown	1f67eb7450	Update upstream B/CB/Spigot	2016-04-07 00:32:10 -05:00
Zach Brown	daab2c8a77	Upstream merge	2016-04-05 11:42:40 -05:00
Zach Brown	bce92696c6	Update upstream and rebuild	2016-04-04 09:53:03 -05:00
DemonWav	5479e7ab80	Update Paperclip	2016-04-01 23:20:56 -05:00
DemonWav	8b66d99e73	Cleanup and restructure the project	2016-04-01 23:15:41 -05:00